Jakarta EJB namespace transition
Signed-off-by: Gaurav Gupta <gaurav.gupta@payara.fish>
diff --git a/appserver/tests/appserv-tests/devtests/admin/cli/apps/MyEjb/MyEjb-ejb/src/java/foo/MySessionBean.java b/appserver/tests/appserv-tests/devtests/admin/cli/apps/MyEjb/MyEjb-ejb/src/java/foo/MySessionBean.java
index 62930ce..c359bd2 100644
--- a/appserver/tests/appserv-tests/devtests/admin/cli/apps/MyEjb/MyEjb-ejb/src/java/foo/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/admin/cli/apps/MyEjb/MyEjb-ejb/src/java/foo/MySessionBean.java
@@ -21,7 +21,7 @@
package foo;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/admin/cli/apps/MyEjb/MyEjb-ejb/src/java/foo/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/admin/cli/apps/MyEjb/MyEjb-ejb/src/java/foo/MySessionBeanRemote.java
index 84cebab..06ff63e 100644
--- a/appserver/tests/appserv-tests/devtests/admin/cli/apps/MyEjb/MyEjb-ejb/src/java/foo/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/admin/cli/apps/MyEjb/MyEjb-ejb/src/java/foo/MySessionBeanRemote.java
@@ -21,7 +21,7 @@
package foo;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/admin/cli/apps/MyEjb/MyEjb-war/src/java/MyEjbServlet.java b/appserver/tests/appserv-tests/devtests/admin/cli/apps/MyEjb/MyEjb-war/src/java/MyEjbServlet.java
index 4772fe8..7c6b79d 100644
--- a/appserver/tests/appserv-tests/devtests/admin/cli/apps/MyEjb/MyEjb-war/src/java/MyEjbServlet.java
+++ b/appserver/tests/appserv-tests/devtests/admin/cli/apps/MyEjb/MyEjb-war/src/java/MyEjbServlet.java
@@ -22,7 +22,7 @@
import foo.MySessionBeanRemote;
import java.io.IOException;
import java.io.PrintWriter;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
diff --git a/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/client/Client.java b/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/client/Client.java
index 57252b8..fff74a0 100644
--- a/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/client/Client.java
@@ -19,7 +19,7 @@
import java.io.*;
import java.util.*;
import javax.naming.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import com.oracle.javaee7.samples.batch.chunk.*;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
diff --git a/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/Sless.java b/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/Sless.java
index c5c3e8a..68ae846 100644
--- a/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/Sless.java
@@ -10,7 +10,7 @@
package com.oracle.javaee7.samples.batch.chunk;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface Sless {
diff --git a/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/SlessBean.java b/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/SlessBean.java
index 43de0a0..7c7b0e6 100644
--- a/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/SlessBean.java
+++ b/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/SlessBean.java
@@ -19,10 +19,10 @@
import javax.batch.operations.JobOperator;
import javax.batch.runtime.BatchRuntime;
import javax.batch.runtime.JobExecution;
-import javax.ejb.Stateless;
-import javax.ejb.EJB;
-import javax.ejb.TransactionManagement;
-import javax.ejb.TransactionManagementType;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.EJB;
+import jakarta.ejb.TransactionManagement;
+import jakarta.ejb.TransactionManagementType;
@TransactionManagement(TransactionManagementType.BEAN)
@Stateless
diff --git a/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/client/Client.java b/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/client/Client.java
index 693cee5..86725d8 100644
--- a/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/client/Client.java
@@ -19,7 +19,7 @@
import java.io.*;
import java.util.*;
import javax.naming.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import com.oracle.javaee7.samples.batch.cmt.chunk.*;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
diff --git a/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/JobSubmitter.java b/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/JobSubmitter.java
index d241e5f..3224972 100644
--- a/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/JobSubmitter.java
+++ b/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/JobSubmitter.java
@@ -10,7 +10,7 @@
package com.oracle.javaee7.samples.batch.cmt.chunk;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
import java.util.Collection;
import java.util.Map;
import java.util.List;
diff --git a/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/JobSubmitterBean.java b/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/JobSubmitterBean.java
index 0c6d2d4..a9b67d9 100644
--- a/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/JobSubmitterBean.java
+++ b/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/JobSubmitterBean.java
@@ -30,8 +30,8 @@
import javax.batch.runtime.JobInstance;
import com.ibm.jbatch.spi.TaggedJobExecution;
-import javax.ejb.Stateless;
-import javax.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.EJB;
@Stateless
public class JobSubmitterBean
diff --git a/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/client/Client.java b/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/client/Client.java
index 061b4f6..890bdeb 100644
--- a/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/client/Client.java
@@ -19,7 +19,7 @@
import java.io.*;
import java.util.*;
import javax.naming.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import com.oracle.javaee7.samples.batch.simple.*;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
diff --git a/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/Sless.java b/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/Sless.java
index 5c5ac84..a112f41 100644
--- a/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/Sless.java
@@ -10,7 +10,7 @@
package com.oracle.javaee7.samples.batch.simple;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface Sless {
diff --git a/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/SlessBean.java b/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/SlessBean.java
index affb413..9196caa 100644
--- a/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/SlessBean.java
+++ b/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/SlessBean.java
@@ -18,8 +18,8 @@
import javax.batch.operations.JobOperator;
import javax.batch.runtime.BatchRuntime;
-import javax.ejb.Stateless;
-import javax.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.EJB;
@Stateless
public class SlessBean
diff --git a/appserver/tests/appserv-tests/devtests/batch/simple-batchlet/client/Client.java b/appserver/tests/appserv-tests/devtests/batch/simple-batchlet/client/Client.java
index eb6f32b..c3990cd 100644
--- a/appserver/tests/appserv-tests/devtests/batch/simple-batchlet/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/batch/simple-batchlet/client/Client.java
@@ -19,7 +19,7 @@
import java.io.*;
import java.util.*;
import javax.naming.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import com.oracle.javaee7.samples.batch.simple.batchlet.*;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
diff --git a/appserver/tests/appserv-tests/devtests/batch/simple-batchlet/ejb/com/oracle/javaee7/samples/batch/simple/batchlet/Sless.java b/appserver/tests/appserv-tests/devtests/batch/simple-batchlet/ejb/com/oracle/javaee7/samples/batch/simple/batchlet/Sless.java
index 195c01d..3631430 100644
--- a/appserver/tests/appserv-tests/devtests/batch/simple-batchlet/ejb/com/oracle/javaee7/samples/batch/simple/batchlet/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/batch/simple-batchlet/ejb/com/oracle/javaee7/samples/batch/simple/batchlet/Sless.java
@@ -10,7 +10,7 @@
package com.oracle.javaee7.samples.batch.simple.batchlet;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface Sless {
diff --git a/appserver/tests/appserv-tests/devtests/batch/simple-batchlet/ejb/com/oracle/javaee7/samples/batch/simple/batchlet/SlessBean.java b/appserver/tests/appserv-tests/devtests/batch/simple-batchlet/ejb/com/oracle/javaee7/samples/batch/simple/batchlet/SlessBean.java
index 40c6c93..282536a 100644
--- a/appserver/tests/appserv-tests/devtests/batch/simple-batchlet/ejb/com/oracle/javaee7/samples/batch/simple/batchlet/SlessBean.java
+++ b/appserver/tests/appserv-tests/devtests/batch/simple-batchlet/ejb/com/oracle/javaee7/samples/batch/simple/batchlet/SlessBean.java
@@ -19,8 +19,8 @@
import javax.batch.operations.JobOperator;
import javax.batch.runtime.BatchRuntime;
import javax.batch.runtime.JobExecution;
-import javax.ejb.Stateless;
-import javax.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.EJB;
@Stateless
public class SlessBean
diff --git a/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/client/Client.java b/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/client/Client.java
index b13dea2..812a38d 100644
--- a/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/client/Client.java
@@ -19,7 +19,7 @@
import java.io.*;
import java.util.*;
import javax.naming.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import com.oracle.javaee7.samples.batch.cmt.chunk.*;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
diff --git a/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/JobSubmitter.java b/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/JobSubmitter.java
index d241e5f..3224972 100644
--- a/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/JobSubmitter.java
+++ b/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/JobSubmitter.java
@@ -10,7 +10,7 @@
package com.oracle.javaee7.samples.batch.cmt.chunk;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
import java.util.Collection;
import java.util.Map;
import java.util.List;
diff --git a/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/JobSubmitterBean.java b/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/JobSubmitterBean.java
index 0c6d2d4..a9b67d9 100644
--- a/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/JobSubmitterBean.java
+++ b/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/JobSubmitterBean.java
@@ -30,8 +30,8 @@
import javax.batch.runtime.JobInstance;
import com.ibm.jbatch.spi.TaggedJobExecution;
-import javax.ejb.Stateless;
-import javax.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.EJB;
@Stateless
public class JobSubmitterBean
diff --git a/appserver/tests/appserv-tests/devtests/batch/two-steps-job/client/Client.java b/appserver/tests/appserv-tests/devtests/batch/two-steps-job/client/Client.java
index 55fb7e3..c10758d 100644
--- a/appserver/tests/appserv-tests/devtests/batch/two-steps-job/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/batch/two-steps-job/client/Client.java
@@ -19,7 +19,7 @@
import java.io.*;
import java.util.*;
import javax.naming.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import com.oracle.javaee7.samples.batch.twosteps.*;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
diff --git a/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/Sless.java b/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/Sless.java
index b0c2039..892a7ef 100644
--- a/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/Sless.java
@@ -10,7 +10,7 @@
package com.oracle.javaee7.samples.batch.twosteps;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface Sless {
diff --git a/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/SlessBean.java b/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/SlessBean.java
index d1cb1ff..415b313 100644
--- a/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/SlessBean.java
+++ b/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/SlessBean.java
@@ -19,8 +19,8 @@
import javax.batch.operations.JobOperator;
import javax.batch.runtime.BatchRuntime;
import javax.batch.runtime.JobExecution;
-import javax.ejb.Stateless;
-import javax.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.EJB;
@Stateless
public class SlessBean
diff --git a/appserver/tests/appserv-tests/devtests/cdi/implicit/deployment-option/client/Client.java b/appserver/tests/appserv-tests/devtests/cdi/implicit/deployment-option/client/Client.java
index 65d580f..4ccadc7 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/implicit/deployment-option/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/implicit/deployment-option/client/Client.java
@@ -16,7 +16,7 @@
import java.io.*;
import java.util.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import javax.naming.InitialContext;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/implicit/deployment-option/ejb/Sless.java b/appserver/tests/appserv-tests/devtests/cdi/implicit/deployment-option/ejb/Sless.java
index 851ca56..be2b008 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/implicit/deployment-option/ejb/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/implicit/deployment-option/ejb/Sless.java
@@ -14,7 +14,7 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface Sless {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/implicit/deployment-option/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/cdi/implicit/deployment-option/ejb/SlessEJB.java
index 30d299a..f0f4d56 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/implicit/deployment-option/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/implicit/deployment-option/ejb/SlessEJB.java
@@ -14,7 +14,7 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import javax.inject.Inject;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/implicit/simple-ejb-cdi/client/Client.java b/appserver/tests/appserv-tests/devtests/cdi/implicit/simple-ejb-cdi/client/Client.java
index 339f717..f96b043 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/implicit/simple-ejb-cdi/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/implicit/simple-ejb-cdi/client/Client.java
@@ -16,7 +16,7 @@
import java.io.*;
import java.util.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import javax.naming.InitialContext;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/implicit/simple-ejb-cdi/ejb/Sless.java b/appserver/tests/appserv-tests/devtests/cdi/implicit/simple-ejb-cdi/ejb/Sless.java
index 851ca56..be2b008 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/implicit/simple-ejb-cdi/ejb/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/implicit/simple-ejb-cdi/ejb/Sless.java
@@ -14,7 +14,7 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface Sless {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/implicit/simple-ejb-cdi/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/cdi/implicit/simple-ejb-cdi/ejb/SlessEJB.java
index 30d299a..f0f4d56 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/implicit/simple-ejb-cdi/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/implicit/simple-ejb-cdi/ejb/SlessEJB.java
@@ -14,7 +14,7 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import javax.inject.Inject;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/org/glassfish/cditest/security/interceptor/SecurityInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/org/glassfish/cditest/security/interceptor/SecurityInterceptor.java
index ac6170c..890e9cd 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/org/glassfish/cditest/security/interceptor/SecurityInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/org/glassfish/cditest/security/interceptor/SecurityInterceptor.java
@@ -22,7 +22,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
-import javax.ejb.EJBContext;
+import jakarta.ejb.EJBContext;
import javax.interceptor.AroundInvoke;
import javax.interceptor.Interceptor;
import javax.interceptor.InvocationContext;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/org/glassfish/cditest/user/api/UserService.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/org/glassfish/cditest/user/api/UserService.java
index b727c50..86eec7b 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/org/glassfish/cditest/user/api/UserService.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/org/glassfish/cditest/user/api/UserService.java
@@ -21,7 +21,7 @@
package org.glassfish.cditest.user.api;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJBException;
import org.glassfish.cditest.user.api.model.User;
/**
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/org/glassfish/cditest/user/impl/UserServiceImpl.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/org/glassfish/cditest/user/impl/UserServiceImpl.java
index 8284c73..bdf5928 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/org/glassfish/cditest/user/impl/UserServiceImpl.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/org/glassfish/cditest/user/impl/UserServiceImpl.java
@@ -19,9 +19,9 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.ejb.EJBException;
-import javax.ejb.Local;
-import javax.ejb.Stateless;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.Local;
+import jakarta.ejb.Stateless;
import org.glassfish.cditest.security.api.Secure;
import org.glassfish.cditest.user.api.UserService;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/test/servlet/InterceptorsTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/test/servlet/InterceptorsTestServlet.java
index 77edccf..9196c91 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/test/servlet/InterceptorsTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/test/servlet/InterceptorsTestServlet.java
@@ -19,7 +19,7 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/org/glassfish/cditest/security/interceptor/SecurityInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/org/glassfish/cditest/security/interceptor/SecurityInterceptor.java
index ac6170c..890e9cd 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/org/glassfish/cditest/security/interceptor/SecurityInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/org/glassfish/cditest/security/interceptor/SecurityInterceptor.java
@@ -22,7 +22,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
-import javax.ejb.EJBContext;
+import jakarta.ejb.EJBContext;
import javax.interceptor.AroundInvoke;
import javax.interceptor.Interceptor;
import javax.interceptor.InvocationContext;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/org/glassfish/cditest/user/api/UserService.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/org/glassfish/cditest/user/api/UserService.java
index b727c50..86eec7b 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/org/glassfish/cditest/user/api/UserService.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/org/glassfish/cditest/user/api/UserService.java
@@ -21,7 +21,7 @@
package org.glassfish.cditest.user.api;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJBException;
import org.glassfish.cditest.user.api.model.User;
/**
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/org/glassfish/cditest/user/impl/UserServiceImpl.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/org/glassfish/cditest/user/impl/UserServiceImpl.java
index d938b81..ad8e6db 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/org/glassfish/cditest/user/impl/UserServiceImpl.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/org/glassfish/cditest/user/impl/UserServiceImpl.java
@@ -19,9 +19,9 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.ejb.EJBException;
-import javax.ejb.Local;
-import javax.ejb.Stateless;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.Local;
+import jakarta.ejb.Stateless;
import org.glassfish.cditest.security.api.Secure;
import org.glassfish.cditest.user.api.UserService;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/test/servlet/InterceptorsTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/test/servlet/InterceptorsTestServlet.java
index 77edccf..9196c91 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/test/servlet/InterceptorsTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/test/servlet/InterceptorsTestServlet.java
@@ -19,7 +19,7 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/beans/nonmock/TestEJBInjectionViaAtEJB.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/beans/nonmock/TestEJBInjectionViaAtEJB.java
index 9948f7c..e6b1c7f 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/beans/nonmock/TestEJBInjectionViaAtEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/beans/nonmock/TestEJBInjectionViaAtEJB.java
@@ -16,7 +16,7 @@
package test.beans.nonmock;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import javax.enterprise.context.RequestScoped;
import javax.inject.Named;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/ejb/TestNoInterfaceEJB.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/ejb/TestNoInterfaceEJB.java
index 64e874e..7de9921 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/ejb/TestNoInterfaceEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/ejb/TestNoInterfaceEJB.java
@@ -16,7 +16,7 @@
package test.ejb;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import javax.persistence.EntityManager;
import javax.inject.Inject;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/ejb/com/acme/ejb/api/HelloRemote.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/ejb/com/acme/ejb/api/HelloRemote.java
index 0993e59..95d10f0 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/ejb/com/acme/ejb/api/HelloRemote.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/ejb/com/acme/ejb/api/HelloRemote.java
@@ -16,7 +16,7 @@
package com.acme.ejb.api;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface HelloRemote {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/ejb/com/acme/ejb/impl/HelloSingleton.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/ejb/com/acme/ejb/impl/HelloSingleton.java
index 9d3649a..8a461aa 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/ejb/com/acme/ejb/impl/HelloSingleton.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/ejb/com/acme/ejb/impl/HelloSingleton.java
@@ -19,10 +19,10 @@
import jakarta.annotation.PostConstruct;
import jakarta.annotation.PreDestroy;
import jakarta.annotation.Resource;
-import javax.ejb.DependsOn;
-import javax.ejb.SessionContext;
-import javax.ejb.Singleton;
-import javax.ejb.Startup;
+import jakarta.ejb.DependsOn;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup;
import javax.persistence.EntityManagerFactory;
import javax.persistence.PersistenceUnit;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/ejb/com/acme/ejb/impl/Singleton4.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/ejb/com/acme/ejb/impl/Singleton4.java
index 6881f21..a54c59e 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/ejb/com/acme/ejb/impl/Singleton4.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/ejb/com/acme/ejb/impl/Singleton4.java
@@ -16,7 +16,7 @@
package com.acme.ejb.impl;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/war/com/acme/servlet/HelloServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/war/com/acme/servlet/HelloServlet.java
index 221e1e4..b2b2878 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/war/com/acme/servlet/HelloServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/war/com/acme/servlet/HelloServlet.java
@@ -20,7 +20,7 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import javax.inject.Inject;
import javax.persistence.EntityManagerFactory;
import javax.persistence.PersistenceUnit;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/ejb/TestEJB.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/ejb/TestEJB.java
index 4065801..faf3af0 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/ejb/TestEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/ejb/TestEJB.java
@@ -16,7 +16,7 @@
package test.ejb;
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
import javax.inject.Inject;
import javax.persistence.EntityManager;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/ejb/JPAResourceProducerSingletonEJB_BusinessMethodProducer.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/ejb/JPAResourceProducerSingletonEJB_BusinessMethodProducer.java
index b20fae4..dd118e7 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/ejb/JPAResourceProducerSingletonEJB_BusinessMethodProducer.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/ejb/JPAResourceProducerSingletonEJB_BusinessMethodProducer.java
@@ -23,7 +23,7 @@
import test.beans.artifacts.ProducedViaProducerMethod;
import test.beans.artifacts.ProducedViaStaticField;
-@javax.ejb.Singleton
+@jakarta.ejb.Singleton
public class JPAResourceProducerSingletonEJB_BusinessMethodProducer {
@PersistenceUnit(unitName="pu1")
EntityManagerFactory customerDatabasePersistenceUnit;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/ejb/JPAResourceProducerSingletonEJB_StaticField.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/ejb/JPAResourceProducerSingletonEJB_StaticField.java
index adbca7b..79c781e 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/ejb/JPAResourceProducerSingletonEJB_StaticField.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/ejb/JPAResourceProducerSingletonEJB_StaticField.java
@@ -22,7 +22,7 @@
import test.beans.artifacts.ProducedViaStaticField;
-@javax.ejb.Singleton
+@jakarta.ejb.Singleton
public class JPAResourceProducerSingletonEJB_StaticField {
@Produces @PersistenceUnit(unitName="pu1") @ProducedViaStaticField
public static EntityManagerFactory customerDatabasePersistenceUnit1;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/nonmock/local/TestEJBInjectionViaAtEJB.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/nonmock/local/TestEJBInjectionViaAtEJB.java
index edadb04..b0e9baa 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/nonmock/local/TestEJBInjectionViaAtEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/nonmock/local/TestEJBInjectionViaAtEJB.java
@@ -16,7 +16,7 @@
package test.beans.nonmock.local;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import javax.enterprise.context.RequestScoped;
import javax.inject.Named;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/nonmock/nointerfacebeanview/TestEJBInjectionViaAtEJB.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/nonmock/nointerfacebeanview/TestEJBInjectionViaAtEJB.java
index a6eaacd..78ceaef 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/nonmock/nointerfacebeanview/TestEJBInjectionViaAtEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/nonmock/nointerfacebeanview/TestEJBInjectionViaAtEJB.java
@@ -16,7 +16,7 @@
package test.beans.nonmock.nointerfacebeanview;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import javax.enterprise.context.RequestScoped;
import javax.inject.Named;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/ejb/local/TestLocalEJB.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/ejb/local/TestLocalEJB.java
index 18054b1..df07ce7 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/ejb/local/TestLocalEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/ejb/local/TestLocalEJB.java
@@ -16,8 +16,8 @@
package test.ejb.local;
-import javax.ejb.Local;
-import javax.ejb.Stateless;
+import jakarta.ejb.Local;
+import jakarta.ejb.Stateless;
@Stateless
@Local(TestInterface.class)
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/ejb/nointerfacebeanview/TestNoInterfaceEJB.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/ejb/nointerfacebeanview/TestNoInterfaceEJB.java
index ec60e4d..680ee42 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/ejb/nointerfacebeanview/TestNoInterfaceEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/ejb/nointerfacebeanview/TestNoInterfaceEJB.java
@@ -16,7 +16,7 @@
package test.ejb.nointerfacebeanview;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
@Stateless
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/nonmock/local/TestEJBInjectionViaAtEJB.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/nonmock/local/TestEJBInjectionViaAtEJB.java
index edadb04..b0e9baa 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/nonmock/local/TestEJBInjectionViaAtEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/nonmock/local/TestEJBInjectionViaAtEJB.java
@@ -16,7 +16,7 @@
package test.beans.nonmock.local;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import javax.enterprise.context.RequestScoped;
import javax.inject.Named;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/nonmock/nointerfacebeanview/TestEJBInjectionViaAtEJB.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/nonmock/nointerfacebeanview/TestEJBInjectionViaAtEJB.java
index ccd055e..3c75b8a 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/nonmock/nointerfacebeanview/TestEJBInjectionViaAtEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/nonmock/nointerfacebeanview/TestEJBInjectionViaAtEJB.java
@@ -16,7 +16,7 @@
package test.beans.nonmock.nointerfacebeanview;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import javax.enterprise.context.RequestScoped;
import javax.inject.Named;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/ejb/local/TestLocalEJB.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/ejb/local/TestLocalEJB.java
index ce06ab6..6ad195d 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/ejb/local/TestLocalEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/ejb/local/TestLocalEJB.java
@@ -16,8 +16,8 @@
package test.ejb.local;
-import javax.ejb.Local;
-import javax.ejb.Stateless;
+import jakarta.ejb.Local;
+import jakarta.ejb.Stateless;
@Stateless
@Local(TestInterface.class)
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/ejb/nointerfacebeanview/TestNoInterfaceEJB.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/ejb/nointerfacebeanview/TestNoInterfaceEJB.java
index 64ebd63..9509c39 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/ejb/nointerfacebeanview/TestNoInterfaceEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/ejb/nointerfacebeanview/TestNoInterfaceEJB.java
@@ -16,7 +16,7 @@
package test.ejb.nointerfacebeanview;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
@Stateless
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/ejb/slsb/TestSLSB.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/ejb/slsb/TestSLSB.java
index 96b85d8..0b6f4ee 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/ejb/slsb/TestSLSB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/ejb/slsb/TestSLSB.java
@@ -15,7 +15,7 @@
*/
package test.ejb.slsb;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import javax.enterprise.context.Dependent;
import javax.inject.Named;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/ejb/com/acme/ejb/api/HelloRemote.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/ejb/com/acme/ejb/api/HelloRemote.java
index 0993e59..95d10f0 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/ejb/com/acme/ejb/api/HelloRemote.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/ejb/com/acme/ejb/api/HelloRemote.java
@@ -16,7 +16,7 @@
package com.acme.ejb.api;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface HelloRemote {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/ejb/com/acme/ejb/impl/HelloSingleton.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/ejb/com/acme/ejb/impl/HelloSingleton.java
index f969da6..27ba611 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/ejb/com/acme/ejb/impl/HelloSingleton.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/ejb/com/acme/ejb/impl/HelloSingleton.java
@@ -19,10 +19,10 @@
import jakarta.annotation.PostConstruct;
import jakarta.annotation.PreDestroy;
import jakarta.annotation.Resource;
-import javax.ejb.DependsOn;
-import javax.ejb.SessionContext;
-import javax.ejb.Singleton;
-import javax.ejb.Startup;
+import jakarta.ejb.DependsOn;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup;
import javax.inject.Inject;
import javax.persistence.EntityManagerFactory;
import javax.persistence.PersistenceUnit;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/ejb/com/acme/ejb/impl/Singleton4.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/ejb/com/acme/ejb/impl/Singleton4.java
index 6881f21..a54c59e 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/ejb/com/acme/ejb/impl/Singleton4.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/ejb/com/acme/ejb/impl/Singleton4.java
@@ -16,7 +16,7 @@
package com.acme.ejb.impl;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/war/com/acme/servlet/HelloServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/war/com/acme/servlet/HelloServlet.java
index 7f9875a..c7d69ac 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/war/com/acme/servlet/HelloServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/war/com/acme/servlet/HelloServlet.java
@@ -20,7 +20,7 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import javax.persistence.EntityManagerFactory;
import javax.persistence.PersistenceUnit;
import javax.servlet.ServletException;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/app/src/beans/MessageChecker.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/app/src/beans/MessageChecker.java
index f582a2a..49ccf52 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/app/src/beans/MessageChecker.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/app/src/beans/MessageChecker.java
@@ -18,7 +18,7 @@
import java.rmi.RemoteException;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
public interface MessageChecker extends EJBObject {
int getMessageCount() throws RemoteException;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/app/src/beans/MessageCheckerEJB.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/app/src/beans/MessageCheckerEJB.java
index 2751b06..a7f24be 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/app/src/beans/MessageCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/app/src/beans/MessageCheckerEJB.java
@@ -22,10 +22,10 @@
import java.sql.Statement;
import java.util.Properties;
-import javax.ejb.CreateException;
-import javax.ejb.EJBException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.sql.DataSource;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/app/src/beans/MessageCheckerHome.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/app/src/beans/MessageCheckerHome.java
index 9b56081..335b681 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/app/src/beans/MessageCheckerHome.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/app/src/beans/MessageCheckerHome.java
@@ -18,8 +18,8 @@
import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBHome;
public interface MessageCheckerHome extends EJBHome {
MessageChecker create() throws RemoteException, CreateException;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/app/src/mdb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/app/src/mdb/MyMessageBean.java
index 0d17b43..7422ff3 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/app/src/mdb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/app/src/mdb/MyMessageBean.java
@@ -18,8 +18,8 @@
import java.sql.Statement;
-import javax.ejb.MessageDrivenBean;
-import javax.ejb.MessageDrivenContext;
+import jakarta.ejb.MessageDrivenBean;
+import jakarta.ejb.MessageDrivenContext;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.sql.DataSource;
@@ -45,7 +45,7 @@
/**
* setMessageDrivenContext method, declared as public (but not final or
* static), with a return type of void, and with one argument of type
- * javax.ejb.MessageDrivenContext.
+ * jakarta.ejb.MessageDrivenContext.
*
* @param mdc
* the context to set
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/no-interface-local-view-proxy-serializable/servlet/test/ejb/HelloNoInterfaceLocalViewSfulEJB.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/no-interface-local-view-proxy-serializable/servlet/test/ejb/HelloNoInterfaceLocalViewSfulEJB.java
index 0abcba6..e94ddf1 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/no-interface-local-view-proxy-serializable/servlet/test/ejb/HelloNoInterfaceLocalViewSfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/no-interface-local-view-proxy-serializable/servlet/test/ejb/HelloNoInterfaceLocalViewSfulEJB.java
@@ -16,7 +16,7 @@
package test.ejb;
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
@Stateful
public class HelloNoInterfaceLocalViewSfulEJB {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/no-interface-local-view-proxy-serializable/servlet/test/ejb/HelloNoInterfaceLocalViewSlessEJB.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/no-interface-local-view-proxy-serializable/servlet/test/ejb/HelloNoInterfaceLocalViewSlessEJB.java
index 4818e1f..e01eee3 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/no-interface-local-view-proxy-serializable/servlet/test/ejb/HelloNoInterfaceLocalViewSlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/no-interface-local-view-proxy-serializable/servlet/test/ejb/HelloNoInterfaceLocalViewSlessEJB.java
@@ -16,7 +16,7 @@
package test.ejb;
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
@Stateful
public class HelloNoInterfaceLocalViewSlessEJB {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/normal-bean-injection-ear/ejb/com/acme/HelloSingleton.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/normal-bean-injection-ear/ejb/com/acme/HelloSingleton.java
index fbe5831..751d2b2 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/normal-bean-injection-ear/ejb/com/acme/HelloSingleton.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/normal-bean-injection-ear/ejb/com/acme/HelloSingleton.java
@@ -19,10 +19,10 @@
import jakarta.annotation.PostConstruct;
import jakarta.annotation.PreDestroy;
import jakarta.annotation.Resource;
-import javax.ejb.EJB;
-import javax.ejb.SessionContext;
-import javax.ejb.Singleton;
-import javax.ejb.Startup;
+import jakarta.ejb.EJB;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup;
@Singleton
@Startup
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/normal-bean-injection-ear/war/com/acme/NormalLookupInEARServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/normal-bean-injection-ear/war/com/acme/NormalLookupInEARServlet.java
index fff3675..13649f5 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/normal-bean-injection-ear/war/com/acme/NormalLookupInEARServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/normal-bean-injection-ear/war/com/acme/NormalLookupInEARServlet.java
@@ -20,7 +20,7 @@
import java.io.PrintWriter;
import jakarta.annotation.Resource;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import javax.enterprise.inject.Instance;
import javax.inject.Inject;
import javax.naming.InitialContext;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/programmatic-lookup-ear/ejb/com/acme/HelloSingleton.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/programmatic-lookup-ear/ejb/com/acme/HelloSingleton.java
index fbe5831..751d2b2 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/programmatic-lookup-ear/ejb/com/acme/HelloSingleton.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/programmatic-lookup-ear/ejb/com/acme/HelloSingleton.java
@@ -19,10 +19,10 @@
import jakarta.annotation.PostConstruct;
import jakarta.annotation.PreDestroy;
import jakarta.annotation.Resource;
-import javax.ejb.EJB;
-import javax.ejb.SessionContext;
-import javax.ejb.Singleton;
-import javax.ejb.Startup;
+import jakarta.ejb.EJB;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup;
@Singleton
@Startup
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/programmatic-lookup-ear/war/com/acme/ProgrammaticLookupInEARServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/programmatic-lookup-ear/war/com/acme/ProgrammaticLookupInEARServlet.java
index 646b891..8f0c6d7 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/programmatic-lookup-ear/war/com/acme/ProgrammaticLookupInEARServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/programmatic-lookup-ear/war/com/acme/ProgrammaticLookupInEARServlet.java
@@ -20,7 +20,7 @@
import java.io.PrintWriter;
import jakarta.annotation.Resource;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import javax.enterprise.inject.Instance;
import javax.inject.Inject;
import javax.naming.InitialContext;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/src/beans/MessageChecker.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/src/beans/MessageChecker.java
index 48573f8..9706eb7 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/src/beans/MessageChecker.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/src/beans/MessageChecker.java
@@ -16,7 +16,7 @@
package beans;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
import java.rmi.RemoteException;
import java.sql.SQLException;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/src/beans/MessageCheckerEJB.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/src/beans/MessageCheckerEJB.java
index bdc3f62..1dfd435 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/src/beans/MessageCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/src/beans/MessageCheckerEJB.java
@@ -18,10 +18,10 @@
import connector.MyAdminObject;
import javax.rmi.PortableRemoteObject;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
-import javax.ejb.CreateException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.CreateException;
import java.util.Properties;
import java.util.Vector;
import java.sql.*;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/src/beans/MessageCheckerHome.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/src/beans/MessageCheckerHome.java
index 4bcc578..790606c 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/src/beans/MessageCheckerHome.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/src/beans/MessageCheckerHome.java
@@ -17,8 +17,8 @@
package beans;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface MessageCheckerHome extends EJBHome {
MessageChecker create() throws RemoteException, CreateException;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/src/mdb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/src/mdb/MyMessageBean.java
index 9f53213..4ab30e4 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/src/mdb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/src/mdb/MyMessageBean.java
@@ -18,14 +18,14 @@
import java.sql.Statement;
-import javax.ejb.MessageDrivenBean;
-import javax.ejb.MessageDrivenContext;
+import jakarta.ejb.MessageDrivenBean;
+import jakarta.ejb.MessageDrivenContext;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.sql.DataSource;
import connector.MyMessageListener;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import java.io.*;
import java.rmi.RemoteException;
@@ -56,7 +56,7 @@
/**
* setMessageDrivenContext method, declared as public (but
* not final or static), with a return type of void, and
- * with one argument of type javax.ejb.MessageDrivenContext.
+ * with one argument of type jakarta.ejb.MessageDrivenContext.
*
* @param mdc the context to set
*/
diff --git a/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/client/Client.java b/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/client/Client.java
index ff6f063..5fdac05 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/client/Client.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.cdi.hello.mdb.client;
import jakarta.annotation.Resource;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import jakarta.jms.Destination;
import jakarta.jms.JMSException;
import jakarta.jms.Message;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/mdb/MessageBean.java b/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/mdb/MessageBean.java
index 8bcebbd..deb0e67 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/mdb/MessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/mdb/MessageBean.java
@@ -17,11 +17,11 @@
package test.ejb.mdb;
import jakarta.annotation.Resource;
-import javax.ejb.EJB;
-import javax.ejb.MessageDriven;
-import javax.ejb.NoSuchEJBException;
-import javax.ejb.TransactionManagement;
-import javax.ejb.TransactionManagementType;
+import jakarta.ejb.EJB;
+import jakarta.ejb.MessageDriven;
+import jakarta.ejb.NoSuchEJBException;
+import jakarta.ejb.TransactionManagement;
+import jakarta.ejb.TransactionManagementType;
import javax.enterprise.inject.spi.BeanManager;
import javax.inject.Inject;
import jakarta.jms.Message;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/session/HelloStateful.java b/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/session/HelloStateful.java
index 1277335..9ee988c 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/session/HelloStateful.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/session/HelloStateful.java
@@ -16,8 +16,8 @@
package test.ejb.session;
-import javax.ejb.Stateful;
-import javax.ejb.Remove;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.Remove;
import jakarta.annotation.PreDestroy;
@Stateful(description="my stateful bean description")
diff --git a/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/session/HelloStateless.java b/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/session/HelloStateless.java
index f3e09ec..2546fdb 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/session/HelloStateless.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/session/HelloStateless.java
@@ -16,7 +16,7 @@
package test.ejb.session;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
// Hello1 interface is not annotated with @Local. If the
// bean only implements one interface it is assumed to be
diff --git a/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/session/HelloStatelessRemoteBean.java b/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/session/HelloStatelessRemoteBean.java
index 2fc6e1f..b212179 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/session/HelloStatelessRemoteBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/session/HelloStatelessRemoteBean.java
@@ -17,8 +17,8 @@
package test.ejb.session;
import jakarta.annotation.PostConstruct;
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
+import jakarta.ejb.Remote;
+import jakarta.ejb.Stateless;
import javax.enterprise.inject.spi.BeanManager;
import javax.inject.Inject;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/timer/TestEJBTimerBean.java b/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/timer/TestEJBTimerBean.java
index 22599dd..e2ebdef 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/timer/TestEJBTimerBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/timer/TestEJBTimerBean.java
@@ -16,9 +16,9 @@
package test.ejb.timer;
-import javax.ejb.Schedule;
-import javax.ejb.Stateless;
-import javax.ejb.Timer;
+import jakarta.ejb.Schedule;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.Timer;
import javax.inject.Inject;
import test.beans.BeanToTestTimerUse;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/BarManagedBean.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/BarManagedBean.java
index d5f4e93..9053e6a 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/BarManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/BarManagedBean.java
@@ -17,7 +17,7 @@
package com.acme;
import jakarta.annotation.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import jakarta.annotation.Resource;
import javax.sql.DataSource;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/FooManagedBean.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/FooManagedBean.java
index 91801e7..e7bca3e 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/FooManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/FooManagedBean.java
@@ -18,7 +18,7 @@
import jakarta.annotation.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import jakarta.annotation.Resource;
import org.omg.CORBA.ORB;
import javax.persistence.PersistenceContext;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/HelloRemote.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/HelloRemote.java
index fc138ad..f21d03a 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/HelloRemote.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/HelloRemote.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface HelloRemote {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/HelloSingleton.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/HelloSingleton.java
index e91a9cc..6d9206d 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/HelloSingleton.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/HelloSingleton.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import org.omg.CORBA.ORB;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/HelloStateless.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/HelloStateless.java
index f7e08bc..b094856 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/HelloStateless.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/HelloStateless.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import org.omg.CORBA.ORB;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/ManagedSuper.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/ManagedSuper.java
index 2113fda..3401b41 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/ManagedSuper.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/ManagedSuper.java
@@ -17,7 +17,7 @@
package com.acme;
import jakarta.annotation.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import jakarta.annotation.Resource;
import javax.sql.DataSource;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/Singleton2.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/Singleton2.java
index 9095863..bcda194 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/Singleton2.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/Singleton2.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/Singleton3.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/Singleton3.java
index 15ad853..084ed7a 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/Singleton3.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/Singleton3.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/Singleton4.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/Singleton4.java
index 8717bfb..7386388 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/Singleton4.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/Singleton4.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/Foo2ManagedBean.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/Foo2ManagedBean.java
index 0972fc0..5f538ad 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/Foo2ManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/Foo2ManagedBean.java
@@ -18,7 +18,7 @@
import jakarta.annotation.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import jakarta.annotation.Resource;
import org.omg.CORBA.ORB;
import javax.persistence.PersistenceContext;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/Hello.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/Hello.java
index d08c598..2c0cbe4 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/Hello.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
public interface Hello {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/HelloRemote.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/HelloRemote.java
index fc138ad..f21d03a 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/HelloRemote.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/HelloRemote.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface HelloRemote {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/HelloServlet.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/HelloServlet.java
index 030199f..d8a5609 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/HelloServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/HelloServlet.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import java.io.IOException;
import java.io.PrintWriter;
import javax.servlet.ServletConfig;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/Sful.java
index bd40dc3..3b5927d 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/Sful.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.cdi.ejb.hello.session;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface Sful
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/SfulEJB.java
index ded6d50..5c26d0a 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/SfulEJB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.cdi.ejb.hello.session;
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
import javax.inject.Inject;
@Stateful
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/Sless.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/Sless.java
index 97fe185..8bb0acd 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/Sless.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.cdi.ejb.hello.session;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface Sless
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/SlessEJB.java
index dec52e0..e2f0cda 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/SlessEJB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.cdi.ejb.hello.session;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import javax.inject.Inject;
@Stateless
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/client/Client.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/client/Client.java
index f4c3848..412b13d 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/client/Client.java
@@ -17,7 +17,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import javax.naming.InitialContext;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/ejb/Foo.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/ejb/Foo.java
index 1d87d9d..c28119d 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/ejb/Foo.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/ejb/Foo.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
public class Foo {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/ejb/SingletonBean.java
index df16597..97d3442 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/ejb/SingletonBean.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import org.omg.CORBA.ORB;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/client/Client.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/client/Client.java
index 0a0e916..8167388 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/client/Client.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.cdi.hello.mdb.client;
import java.io.*;
import java.util.*;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
import jakarta.jms.*;
import jakarta.annotation.Resource;
import javax.naming.InitialContext;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/HelloStateful.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/HelloStateful.java
index 46bff12..17709a9 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/HelloStateful.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/HelloStateful.java
@@ -16,8 +16,8 @@
package com.sun.s1asdev.cdi.hello.mdb;
-import javax.ejb.Stateful;
-import javax.ejb.Remove;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.Remove;
import jakarta.annotation.PreDestroy;
// Hello1 interface is not annotated with @Local. If the
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/HelloStateless.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/HelloStateless.java
index fa86bc5..6747648 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/HelloStateless.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/HelloStateless.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.cdi.hello.mdb;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
// Hello1 interface is not annotated with @Local. If the
// bean only implements one interface it is assumed to be
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/MessageBean.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/MessageBean.java
index 2c3d6cc..be9c27d 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/MessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/MessageBean.java
@@ -16,13 +16,13 @@
package com.sun.s1asdev.cdi.hello.mdb;
-import javax.ejb.MessageDriven;
-import javax.ejb.EJBException;
-import javax.ejb.NoSuchEJBException;
-import javax.ejb.EJB;
-import javax.ejb.TransactionManagement;
-import javax.ejb.TransactionManagementType;
-import javax.ejb.ActivationConfigProperty;
+import jakarta.ejb.MessageDriven;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.NoSuchEJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.TransactionManagement;
+import jakarta.ejb.TransactionManagementType;
+import jakarta.ejb.ActivationConfigProperty;
import jakarta.jms.MessageListener;
import jakarta.jms.Message;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/client/Client.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/client/Client.java
index 6cb4e45..933edbb 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/client/Client.java
@@ -17,7 +17,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import javax.naming.InitialContext;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/ejb/com/acme/Foo.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/ejb/com/acme/Foo.java
index 1d87d9d..c28119d 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/ejb/com/acme/Foo.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/ejb/com/acme/Foo.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
public class Foo {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/ejb/com/acme/SingletonBean.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/ejb/com/acme/SingletonBean.java
index e150032..89d2c3e 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/ejb/com/acme/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/ejb/com/acme/SingletonBean.java
@@ -19,9 +19,9 @@
import jakarta.annotation.PostConstruct;
import jakarta.annotation.PreDestroy;
import jakarta.annotation.Resource;
-import javax.ejb.EJBException;
-import javax.ejb.Singleton;
-import javax.ejb.Startup;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup;
import javax.inject.Inject;
import org.omg.CORBA.ORB;
diff --git a/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/ejb/CoffeeBean.java b/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/ejb/CoffeeBean.java
index b066de5..817e3d7 100644
--- a/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/ejb/CoffeeBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/ejb/CoffeeBean.java
@@ -18,7 +18,7 @@
import java.math.BigDecimal;
import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.resource.cci.*;
import javax.resource.ResourceException;
import javax.naming.*;
diff --git a/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/ejb/CoffeeRemote.java b/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/ejb/CoffeeRemote.java
index 6e9003c..39abd65 100644
--- a/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/ejb/CoffeeRemote.java
+++ b/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/ejb/CoffeeRemote.java
@@ -16,7 +16,7 @@
package com.sun.s1peqe.connector.cci;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
import java.rmi.RemoteException;
public interface CoffeeRemote extends EJBObject {
diff --git a/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/ejb/CoffeeRemoteHome.java b/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/ejb/CoffeeRemoteHome.java
index 05787c1..560ee5b 100644
--- a/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/ejb/CoffeeRemoteHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/ejb/CoffeeRemoteHome.java
@@ -18,8 +18,8 @@
import java.io.Serializable;
import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBHome;
public interface CoffeeRemoteHome extends EJBHome {
CoffeeRemote create() throws RemoteException, CreateException;
diff --git a/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/ejb/CoffeeBean.java b/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/ejb/CoffeeBean.java
index 0b017e8..2e668cc 100644
--- a/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/ejb/CoffeeBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/ejb/CoffeeBean.java
@@ -18,7 +18,7 @@
import java.math.BigDecimal;
import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.resource.cci.*;
import javax.resource.ResourceException;
import javax.naming.*;
diff --git a/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/ejb/CoffeeRemote.java b/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/ejb/CoffeeRemote.java
index 6e9003c..39abd65 100644
--- a/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/ejb/CoffeeRemote.java
+++ b/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/ejb/CoffeeRemote.java
@@ -16,7 +16,7 @@
package com.sun.s1peqe.connector.cci;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
import java.rmi.RemoteException;
public interface CoffeeRemote extends EJBObject {
diff --git a/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/ejb/CoffeeRemoteHome.java b/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/ejb/CoffeeRemoteHome.java
index 05787c1..560ee5b 100644
--- a/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/ejb/CoffeeRemoteHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/ejb/CoffeeRemoteHome.java
@@ -18,8 +18,8 @@
import java.io.Serializable;
import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBHome;
public interface CoffeeRemoteHome extends EJBHome {
CoffeeRemote create() throws RemoteException, CreateException;
diff --git a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/app/src/beans/MessageChecker.java b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/app/src/beans/MessageChecker.java
index 5737506..ccfd9f8 100755
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/app/src/beans/MessageChecker.java
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/app/src/beans/MessageChecker.java
@@ -16,7 +16,7 @@
package beans;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
import java.rmi.RemoteException;
import java.sql.SQLException;
diff --git a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/app/src/beans/MessageCheckerEJB.java b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/app/src/beans/MessageCheckerEJB.java
index 5fdb2e7..491e9e1 100755
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/app/src/beans/MessageCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/app/src/beans/MessageCheckerEJB.java
@@ -18,10 +18,10 @@
import connector.MyAdminObject;
import javax.rmi.PortableRemoteObject;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
-import javax.ejb.CreateException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.CreateException;
import java.util.Properties;
import java.util.Vector;
import java.sql.*;
diff --git a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/app/src/beans/MessageCheckerHome.java b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/app/src/beans/MessageCheckerHome.java
index dfc3820..e25e135 100755
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/app/src/beans/MessageCheckerHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/app/src/beans/MessageCheckerHome.java
@@ -17,8 +17,8 @@
package beans;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface MessageCheckerHome extends EJBHome {
MessageChecker create() throws RemoteException, CreateException;
diff --git a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/app/src/mdb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/app/src/mdb/MyMessageBean.java
index a1c633e..d1a82eb 100755
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/app/src/mdb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/app/src/mdb/MyMessageBean.java
@@ -17,7 +17,7 @@
package mdb;
import connector.MyMessageListener;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import java.io.*;
import javax.servlet.*;
@@ -44,7 +44,7 @@
/**
* setMessageDrivenContext method, declared as public (but
* not final or static), with a return type of void, and
- * with one argument of type javax.ejb.MessageDrivenContext.
+ * with one argument of type jakarta.ejb.MessageDrivenContext.
*
* @param mdc the context to set
*/
diff --git a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/app/src/beans/MessageChecker.java b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/app/src/beans/MessageChecker.java
index 5737506..ccfd9f8 100644
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/app/src/beans/MessageChecker.java
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/app/src/beans/MessageChecker.java
@@ -16,7 +16,7 @@
package beans;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
import java.rmi.RemoteException;
import java.sql.SQLException;
diff --git a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/app/src/beans/MessageCheckerEJB.java b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/app/src/beans/MessageCheckerEJB.java
index 50e0d1f..a655608 100644
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/app/src/beans/MessageCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/app/src/beans/MessageCheckerEJB.java
@@ -18,10 +18,10 @@
import connector.MyAdminObject;
import javax.rmi.PortableRemoteObject;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
-import javax.ejb.CreateException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.CreateException;
import java.util.Properties;
import java.util.Vector;
import java.sql.*;
diff --git a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/app/src/beans/MessageCheckerHome.java b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/app/src/beans/MessageCheckerHome.java
index dfc3820..e25e135 100644
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/app/src/beans/MessageCheckerHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/app/src/beans/MessageCheckerHome.java
@@ -17,8 +17,8 @@
package beans;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface MessageCheckerHome extends EJBHome {
MessageChecker create() throws RemoteException, CreateException;
diff --git a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/app/src/mdb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/app/src/mdb/MyMessageBean.java
index 4aaab3d..576ce98 100644
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/app/src/mdb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/app/src/mdb/MyMessageBean.java
@@ -17,7 +17,7 @@
package mdb;
import connector.MyMessageListener;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.servlet.*;
import javax.servlet.http.*;
@@ -43,7 +43,7 @@
/**
* setMessageDrivenContext method, declared as public (but
* not final or static), with a return type of void, and
- * with one argument of type javax.ejb.MessageDrivenContext.
+ * with one argument of type jakarta.ejb.MessageDrivenContext.
*
* @param mdc the context to set
*/
diff --git a/appserver/tests/appserv-tests/devtests/connector/connector1.5/app/src/beans/MessageChecker.java b/appserver/tests/appserv-tests/devtests/connector/connector1.5/app/src/beans/MessageChecker.java
index 5737506..ccfd9f8 100644
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5/app/src/beans/MessageChecker.java
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5/app/src/beans/MessageChecker.java
@@ -16,7 +16,7 @@
package beans;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
import java.rmi.RemoteException;
import java.sql.SQLException;
diff --git a/appserver/tests/appserv-tests/devtests/connector/connector1.5/app/src/beans/MessageCheckerEJB.java b/appserver/tests/appserv-tests/devtests/connector/connector1.5/app/src/beans/MessageCheckerEJB.java
index 61c9f2d..c61b390 100644
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5/app/src/beans/MessageCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5/app/src/beans/MessageCheckerEJB.java
@@ -18,10 +18,10 @@
import connector.MyAdminObject;
import javax.rmi.PortableRemoteObject;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
-import javax.ejb.CreateException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.CreateException;
import java.util.Properties;
import java.util.Vector;
import java.sql.*;
diff --git a/appserver/tests/appserv-tests/devtests/connector/connector1.5/app/src/beans/MessageCheckerHome.java b/appserver/tests/appserv-tests/devtests/connector/connector1.5/app/src/beans/MessageCheckerHome.java
index dfc3820..e25e135 100644
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5/app/src/beans/MessageCheckerHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5/app/src/beans/MessageCheckerHome.java
@@ -17,8 +17,8 @@
package beans;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface MessageCheckerHome extends EJBHome {
MessageChecker create() throws RemoteException, CreateException;
diff --git a/appserver/tests/appserv-tests/devtests/connector/connector1.5/app/src/mdb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/connector1.5/app/src/mdb/MyMessageBean.java
index 844a6e3..8461859 100644
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5/app/src/mdb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5/app/src/mdb/MyMessageBean.java
@@ -17,7 +17,7 @@
package mdb;
import connector.MyMessageListener;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.servlet.*;
import javax.servlet.http.*;
@@ -43,7 +43,7 @@
/**
* setMessageDrivenContext method, declared as public (but
* not final or static), with a return type of void, and
- * with one argument of type javax.ejb.MessageDrivenContext.
+ * with one argument of type jakarta.ejb.MessageDrivenContext.
*
* @param mdc the context to set
*/
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/app/src/beans/MessageChecker.java b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/app/src/beans/MessageChecker.java
index 5737506..ccfd9f8 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/app/src/beans/MessageChecker.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/app/src/beans/MessageChecker.java
@@ -16,7 +16,7 @@
package beans;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
import java.rmi.RemoteException;
import java.sql.SQLException;
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/app/src/beans/MessageCheckerEJB.java b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/app/src/beans/MessageCheckerEJB.java
index 61c9f2d..c61b390 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/app/src/beans/MessageCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/app/src/beans/MessageCheckerEJB.java
@@ -18,10 +18,10 @@
import connector.MyAdminObject;
import javax.rmi.PortableRemoteObject;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
-import javax.ejb.CreateException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.CreateException;
import java.util.Properties;
import java.util.Vector;
import java.sql.*;
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/app/src/beans/MessageCheckerHome.java b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/app/src/beans/MessageCheckerHome.java
index dfc3820..e25e135 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/app/src/beans/MessageCheckerHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/app/src/beans/MessageCheckerHome.java
@@ -17,8 +17,8 @@
package beans;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface MessageCheckerHome extends EJBHome {
MessageChecker create() throws RemoteException, CreateException;
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/app/src/mdb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/app/src/mdb/MyMessageBean.java
index 287e037..a76aeba 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/app/src/mdb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/app/src/mdb/MyMessageBean.java
@@ -17,7 +17,7 @@
package mdb;
import connector.MyMessageListener;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import java.io.*;
import javax.servlet.*;
@@ -44,7 +44,7 @@
/**
* setMessageDrivenContext method, declared as public (but
* not final or static), with a return type of void, and
- * with one argument of type javax.ejb.MessageDrivenContext.
+ * with one argument of type jakarta.ejb.MessageDrivenContext.
*
* @param mdc the context to set
*/
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/app/src/beans/MessageChecker.java b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/app/src/beans/MessageChecker.java
index 5737506..ccfd9f8 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/app/src/beans/MessageChecker.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/app/src/beans/MessageChecker.java
@@ -16,7 +16,7 @@
package beans;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
import java.rmi.RemoteException;
import java.sql.SQLException;
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/app/src/beans/MessageCheckerEJB.java b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/app/src/beans/MessageCheckerEJB.java
index 61c9f2d..c61b390 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/app/src/beans/MessageCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/app/src/beans/MessageCheckerEJB.java
@@ -18,10 +18,10 @@
import connector.MyAdminObject;
import javax.rmi.PortableRemoteObject;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
-import javax.ejb.CreateException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.CreateException;
import java.util.Properties;
import java.util.Vector;
import java.sql.*;
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/app/src/beans/MessageCheckerHome.java b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/app/src/beans/MessageCheckerHome.java
index dfc3820..e25e135 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/app/src/beans/MessageCheckerHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/app/src/beans/MessageCheckerHome.java
@@ -17,8 +17,8 @@
package beans;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface MessageCheckerHome extends EJBHome {
MessageChecker create() throws RemoteException, CreateException;
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/app/src/mdb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/app/src/mdb/MyMessageBean.java
index 844a6e3..8461859 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/app/src/mdb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/app/src/mdb/MyMessageBean.java
@@ -17,7 +17,7 @@
package mdb;
import connector.MyMessageListener;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.servlet.*;
import javax.servlet.http.*;
@@ -43,7 +43,7 @@
/**
* setMessageDrivenContext method, declared as public (but
* not final or static), with a return type of void, and
- * with one argument of type javax.ejb.MessageDrivenContext.
+ * with one argument of type jakarta.ejb.MessageDrivenContext.
*
* @param mdc the context to set
*/
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/Customer.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/Customer.java
index 2548584..5922f31 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/Customer.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/Customer.java
@@ -18,7 +18,7 @@
import java.rmi.RemoteException;
-public interface Customer extends javax.ejb.EJBObject
+public interface Customer extends jakarta.ejb.EJBObject
{
public String getLastName() throws RemoteException;
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerCheckingEJB.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerCheckingEJB.java
index b3b9bc1..ee0d17c 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerCheckingEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerCheckingEJB.java
@@ -16,7 +16,7 @@
package samples.ejb.subclassing.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import java.sql.*;
import javax.sql.DataSource;
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerCheckingHome.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerCheckingHome.java
index 0bb8f41..69f6580 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerCheckingHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerCheckingHome.java
@@ -19,8 +19,8 @@
import java.rmi.RemoteException;
public interface CustomerCheckingHome extends CustomerHome {
- public CustomerChecking create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws RemoteException,javax.ejb.CreateException;
+ public CustomerChecking create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws RemoteException,jakarta.ejb.CreateException;
- public CustomerChecking findByPrimaryKey(String SSN) throws RemoteException,javax.ejb.FinderException;
+ public CustomerChecking findByPrimaryKey(String SSN) throws RemoteException,jakarta.ejb.FinderException;
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerEJB.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerEJB.java
index a0145ab..0520b60 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerEJB.java
@@ -16,12 +16,12 @@
package samples.ejb.subclassing.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import java.sql.*;
import javax.sql.DataSource;
-public class CustomerEJB implements javax.ejb.EntityBean
+public class CustomerEJB implements jakarta.ejb.EntityBean
{
//database fields
String SSN;
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerHome.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerHome.java
index 3d58631..166572e 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerHome.java
@@ -18,6 +18,6 @@
import java.rmi.RemoteException;
-public interface CustomerHome extends javax.ejb.EJBHome {
+public interface CustomerHome extends jakarta.ejb.EJBHome {
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerSavingsEJB.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerSavingsEJB.java
index 199aa62..f30b506 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerSavingsEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerSavingsEJB.java
@@ -16,7 +16,7 @@
package samples.ejb.subclassing.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import java.sql.*;
import javax.sql.DataSource;
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerSavingsHome.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerSavingsHome.java
index fc07ccd..f99f1d0 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerSavingsHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerSavingsHome.java
@@ -19,8 +19,8 @@
import java.rmi.RemoteException;
public interface CustomerSavingsHome extends CustomerHome {
- public CustomerSavings create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws RemoteException,javax.ejb.CreateException;
+ public CustomerSavings create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws RemoteException,jakarta.ejb.CreateException;
- public CustomerSavings findByPrimaryKey(String SSN) throws RemoteException,javax.ejb.FinderException;
+ public CustomerSavings findByPrimaryKey(String SSN) throws RemoteException,jakarta.ejb.FinderException;
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/servlet/SimpleBankServlet.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/servlet/SimpleBankServlet.java
index f05ebdb..d704112 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/servlet/SimpleBankServlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/servlet/SimpleBankServlet.java
@@ -22,7 +22,7 @@
import javax.naming.*;
import javax.servlet.http.*;
import javax.rmi.PortableRemoteObject;
-import javax.ejb.*;
+import jakarta.ejb.*;
import samples.ejb.subclassing.ejb.*;
import com.sun.jdbcra.spi.JdbcSetupAdmin;
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/Customer.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/Customer.java
index 2548584..5922f31 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/Customer.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/Customer.java
@@ -18,7 +18,7 @@
import java.rmi.RemoteException;
-public interface Customer extends javax.ejb.EJBObject
+public interface Customer extends jakarta.ejb.EJBObject
{
public String getLastName() throws RemoteException;
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerCheckingEJB.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerCheckingEJB.java
index b3b9bc1..ee0d17c 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerCheckingEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerCheckingEJB.java
@@ -16,7 +16,7 @@
package samples.ejb.subclassing.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import java.sql.*;
import javax.sql.DataSource;
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerCheckingHome.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerCheckingHome.java
index 0bb8f41..69f6580 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerCheckingHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerCheckingHome.java
@@ -19,8 +19,8 @@
import java.rmi.RemoteException;
public interface CustomerCheckingHome extends CustomerHome {
- public CustomerChecking create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws RemoteException,javax.ejb.CreateException;
+ public CustomerChecking create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws RemoteException,jakarta.ejb.CreateException;
- public CustomerChecking findByPrimaryKey(String SSN) throws RemoteException,javax.ejb.FinderException;
+ public CustomerChecking findByPrimaryKey(String SSN) throws RemoteException,jakarta.ejb.FinderException;
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerEJB.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerEJB.java
index a0145ab..0520b60 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerEJB.java
@@ -16,12 +16,12 @@
package samples.ejb.subclassing.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import java.sql.*;
import javax.sql.DataSource;
-public class CustomerEJB implements javax.ejb.EntityBean
+public class CustomerEJB implements jakarta.ejb.EntityBean
{
//database fields
String SSN;
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerHome.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerHome.java
index 3d58631..166572e 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerHome.java
@@ -18,6 +18,6 @@
import java.rmi.RemoteException;
-public interface CustomerHome extends javax.ejb.EJBHome {
+public interface CustomerHome extends jakarta.ejb.EJBHome {
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerSavingsEJB.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerSavingsEJB.java
index 199aa62..f30b506 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerSavingsEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerSavingsEJB.java
@@ -16,7 +16,7 @@
package samples.ejb.subclassing.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import java.sql.*;
import javax.sql.DataSource;
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerSavingsHome.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerSavingsHome.java
index fc07ccd..f99f1d0 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerSavingsHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerSavingsHome.java
@@ -19,8 +19,8 @@
import java.rmi.RemoteException;
public interface CustomerSavingsHome extends CustomerHome {
- public CustomerSavings create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws RemoteException,javax.ejb.CreateException;
+ public CustomerSavings create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws RemoteException,jakarta.ejb.CreateException;
- public CustomerSavings findByPrimaryKey(String SSN) throws RemoteException,javax.ejb.FinderException;
+ public CustomerSavings findByPrimaryKey(String SSN) throws RemoteException,jakarta.ejb.FinderException;
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/servlet/SimpleBankServlet.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/servlet/SimpleBankServlet.java
index 71ea8bd..5180787 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/servlet/SimpleBankServlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/servlet/SimpleBankServlet.java
@@ -22,7 +22,7 @@
import javax.naming.*;
import javax.servlet.http.*;
import javax.rmi.PortableRemoteObject;
-import javax.ejb.*;
+import jakarta.ejb.*;
import samples.ejb.subclassing.ejb.*;
import com.sun.jdbcra.spi.JdbcSetupAdmin;
diff --git a/appserver/tests/appserv-tests/devtests/connector/markconnectionasbad.xa.resources-xml/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/connector/markconnectionasbad.xa.resources-xml/ejb/SimpleBMP.java
index 1557bfa..491fb94 100755
--- a/appserver/tests/appserv-tests/devtests/connector/markconnectionasbad.xa.resources-xml/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/connector/markconnectionasbad.xa.resources-xml/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.markconnectionasbad.xa.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMP extends EJBObject {
diff --git a/appserver/tests/appserv-tests/devtests/connector/markconnectionasbad.xa.resources-xml/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/connector/markconnectionasbad.xa.resources-xml/ejb/SimpleBMPBean.java
index e09173a..2c90245 100755
--- a/appserver/tests/appserv-tests/devtests/connector/markconnectionasbad.xa.resources-xml/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/markconnectionasbad.xa.resources-xml/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.markconnectionasbad.xa.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import java.sql.Connection;
import java.sql.Statement;
diff --git a/appserver/tests/appserv-tests/devtests/connector/markconnectionasbad.xa.resources-xml/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/connector/markconnectionasbad.xa.resources-xml/ejb/SimpleBMPHome.java
index 402f66a..15ebcb1 100755
--- a/appserver/tests/appserv-tests/devtests/connector/markconnectionasbad.xa.resources-xml/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/markconnectionasbad.xa.resources-xml/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.markconnectionasbad.xa.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMPHome
diff --git a/appserver/tests/appserv-tests/devtests/connector/mq/cmt/ejb/SimpleMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/mq/cmt/ejb/SimpleMessageBean.java
index 0d7180a..08402a5 100644
--- a/appserver/tests/appserv-tests/devtests/connector/mq/cmt/ejb/SimpleMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/mq/cmt/ejb/SimpleMessageBean.java
@@ -16,8 +16,8 @@
package com.sun.s1peqe.mq.cmt.excpt.ejb;
-import javax.ejb.MessageDrivenBean;
-import javax.ejb.MessageDrivenContext;
+import jakarta.ejb.MessageDrivenBean;
+import jakarta.ejb.MessageDrivenContext;
import javax.naming.*;
import jakarta.jms.*;
import java.sql.*;
diff --git a/appserver/tests/appserv-tests/devtests/connector/mq/ejb30mdb-resources-xml/client/Client.java b/appserver/tests/appserv-tests/devtests/connector/mq/ejb30mdb-resources-xml/client/Client.java
index 2fd969b..adfaa84 100755
--- a/appserver/tests/appserv-tests/devtests/connector/mq/ejb30mdb-resources-xml/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/connector/mq/ejb30mdb-resources-xml/client/Client.java
@@ -18,7 +18,7 @@
import java.io.*;
import java.util.*;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
import jakarta.jms.*;
import jakarta.annotation.Resource;
diff --git a/appserver/tests/appserv-tests/devtests/connector/mq/ejb30mdb-resources-xml/ejb/MessageBean.java b/appserver/tests/appserv-tests/devtests/connector/mq/ejb30mdb-resources-xml/ejb/MessageBean.java
index 15402a1..2b3bd18 100755
--- a/appserver/tests/appserv-tests/devtests/connector/mq/ejb30mdb-resources-xml/ejb/MessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/mq/ejb30mdb-resources-xml/ejb/MessageBean.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb.ejb30.hello.mdb;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.jms.*;
//Messages received from InQueue
diff --git a/appserver/tests/appserv-tests/devtests/connector/mq/ejb30mdb/client/Client.java b/appserver/tests/appserv-tests/devtests/connector/mq/ejb30mdb/client/Client.java
index ed138b8..2c8721e 100644
--- a/appserver/tests/appserv-tests/devtests/connector/mq/ejb30mdb/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/connector/mq/ejb30mdb/client/Client.java
@@ -18,7 +18,7 @@
import java.io.*;
import java.util.*;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
import jakarta.jms.*;
import jakarta.annotation.Resource;
diff --git a/appserver/tests/appserv-tests/devtests/connector/mq/ejb30mdb/ejb/MessageBean.java b/appserver/tests/appserv-tests/devtests/connector/mq/ejb30mdb/ejb/MessageBean.java
index 00c8961..90a14a2 100644
--- a/appserver/tests/appserv-tests/devtests/connector/mq/ejb30mdb/ejb/MessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/mq/ejb30mdb/ejb/MessageBean.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb.ejb30.hello.mdb;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.jms.*;
//Messages received from InQueue
diff --git a/appserver/tests/appserv-tests/devtests/connector/mq/lifecycle/ejb/SimpleMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/mq/lifecycle/ejb/SimpleMessageBean.java
index 6974b78..60a7e5f 100644
--- a/appserver/tests/appserv-tests/devtests/connector/mq/lifecycle/ejb/SimpleMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/mq/lifecycle/ejb/SimpleMessageBean.java
@@ -16,10 +16,10 @@
package com.sun.s1peqe.mq.cmt.excpt.ejb;
-import javax.ejb.EJBException;
-import javax.ejb.MessageDrivenBean;
-import javax.ejb.MessageDrivenContext;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.MessageDrivenBean;
+import jakarta.ejb.MessageDrivenContext;
+import jakarta.ejb.CreateException;
import javax.naming.*;
import jakarta.jms.*;
import java.sql.*;
diff --git a/appserver/tests/appserv-tests/devtests/connector/mq/simplestress/ejb/SimpleMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/mq/simplestress/ejb/SimpleMessageBean.java
index 507dcd1..9d2845b 100644
--- a/appserver/tests/appserv-tests/devtests/connector/mq/simplestress/ejb/SimpleMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/mq/simplestress/ejb/SimpleMessageBean.java
@@ -16,8 +16,8 @@
package com.sun.s1peqe.connector.mq.simplestress.ejb;
-import javax.ejb.MessageDrivenBean;
-import javax.ejb.MessageDrivenContext;
+import jakarta.ejb.MessageDrivenBean;
+import jakarta.ejb.MessageDrivenContext;
import javax.naming.*;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/connector/mq/stress/ejb/SimpleMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/mq/stress/ejb/SimpleMessageBean.java
index 3f0a64f..5645b91 100644
--- a/appserver/tests/appserv-tests/devtests/connector/mq/stress/ejb/SimpleMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/mq/stress/ejb/SimpleMessageBean.java
@@ -16,8 +16,8 @@
package com.sun.s1peqe.connector.mq.simplestress.ejb;
-import javax.ejb.MessageDrivenBean;
-import javax.ejb.MessageDrivenContext;
+import jakarta.ejb.MessageDrivenBean;
+import jakarta.ejb.MessageDrivenContext;
import javax.naming.*;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/connector/mq/varhome/ejb/SimpleMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/mq/varhome/ejb/SimpleMessageBean.java
index 61e1bf3..07b3184 100644
--- a/appserver/tests/appserv-tests/devtests/connector/mq/varhome/ejb/SimpleMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/mq/varhome/ejb/SimpleMessageBean.java
@@ -16,8 +16,8 @@
package com.sun.s1peqe.connector.mq.simplestress.ejb;
-import javax.ejb.MessageDrivenBean;
-import javax.ejb.MessageDrivenContext;
+import jakarta.ejb.MessageDrivenBean;
+import jakarta.ejb.MessageDrivenContext;
import javax.naming.*;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/connector/nonacc/ejb/SimpleMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/nonacc/ejb/SimpleMessageBean.java
index d4ae25c..abe85d8 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonacc/ejb/SimpleMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/nonacc/ejb/SimpleMessageBean.java
@@ -16,8 +16,8 @@
package com.sun.s1peqe.nonacc.simple.ejb;
-import javax.ejb.MessageDrivenBean;
-import javax.ejb.MessageDrivenContext;
+import jakarta.ejb.MessageDrivenBean;
+import jakarta.ejb.MessageDrivenContext;
import javax.naming.*;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/Customer.java b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/Customer.java
index 2548584..5922f31 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/Customer.java
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/Customer.java
@@ -18,7 +18,7 @@
import java.rmi.RemoteException;
-public interface Customer extends javax.ejb.EJBObject
+public interface Customer extends jakarta.ejb.EJBObject
{
public String getLastName() throws RemoteException;
diff --git a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerCheckingEJB.java b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerCheckingEJB.java
index b3b9bc1..ee0d17c 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerCheckingEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerCheckingEJB.java
@@ -16,7 +16,7 @@
package samples.ejb.subclassing.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import java.sql.*;
import javax.sql.DataSource;
diff --git a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerCheckingHome.java b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerCheckingHome.java
index 0bb8f41..69f6580 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerCheckingHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerCheckingHome.java
@@ -19,8 +19,8 @@
import java.rmi.RemoteException;
public interface CustomerCheckingHome extends CustomerHome {
- public CustomerChecking create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws RemoteException,javax.ejb.CreateException;
+ public CustomerChecking create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws RemoteException,jakarta.ejb.CreateException;
- public CustomerChecking findByPrimaryKey(String SSN) throws RemoteException,javax.ejb.FinderException;
+ public CustomerChecking findByPrimaryKey(String SSN) throws RemoteException,jakarta.ejb.FinderException;
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerEJB.java b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerEJB.java
index a0145ab..0520b60 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerEJB.java
@@ -16,12 +16,12 @@
package samples.ejb.subclassing.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import java.sql.*;
import javax.sql.DataSource;
-public class CustomerEJB implements javax.ejb.EntityBean
+public class CustomerEJB implements jakarta.ejb.EntityBean
{
//database fields
String SSN;
diff --git a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerHome.java b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerHome.java
index 3d58631..166572e 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerHome.java
@@ -18,6 +18,6 @@
import java.rmi.RemoteException;
-public interface CustomerHome extends javax.ejb.EJBHome {
+public interface CustomerHome extends jakarta.ejb.EJBHome {
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerSavingsEJB.java b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerSavingsEJB.java
index 199aa62..f30b506 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerSavingsEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerSavingsEJB.java
@@ -16,7 +16,7 @@
package samples.ejb.subclassing.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import java.sql.*;
import javax.sql.DataSource;
diff --git a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerSavingsHome.java b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerSavingsHome.java
index fc07ccd..f99f1d0 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerSavingsHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerSavingsHome.java
@@ -19,8 +19,8 @@
import java.rmi.RemoteException;
public interface CustomerSavingsHome extends CustomerHome {
- public CustomerSavings create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws RemoteException,javax.ejb.CreateException;
+ public CustomerSavings create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws RemoteException,jakarta.ejb.CreateException;
- public CustomerSavings findByPrimaryKey(String SSN) throws RemoteException,javax.ejb.FinderException;
+ public CustomerSavings findByPrimaryKey(String SSN) throws RemoteException,jakarta.ejb.FinderException;
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/servlet/SimpleBankServlet.java b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/servlet/SimpleBankServlet.java
index 71ea8bd..5180787 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/servlet/SimpleBankServlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/servlet/SimpleBankServlet.java
@@ -22,7 +22,7 @@
import javax.naming.*;
import javax.servlet.http.*;
import javax.rmi.PortableRemoteObject;
-import javax.ejb.*;
+import jakarta.ejb.*;
import samples.ejb.subclassing.ejb.*;
import com.sun.jdbcra.spi.JdbcSetupAdmin;
diff --git a/appserver/tests/appserv-tests/devtests/connector/threadpool/app/src/beans/WorkTest.java b/appserver/tests/appserv-tests/devtests/connector/threadpool/app/src/beans/WorkTest.java
index d41d788..820c624 100644
--- a/appserver/tests/appserv-tests/devtests/connector/threadpool/app/src/beans/WorkTest.java
+++ b/appserver/tests/appserv-tests/devtests/connector/threadpool/app/src/beans/WorkTest.java
@@ -16,7 +16,7 @@
package beans;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
import java.rmi.RemoteException;
public interface WorkTest extends EJBObject {
diff --git a/appserver/tests/appserv-tests/devtests/connector/threadpool/app/src/beans/WorkTestEJB.java b/appserver/tests/appserv-tests/devtests/connector/threadpool/app/src/beans/WorkTestEJB.java
index 99e8d3a..1987ead 100644
--- a/appserver/tests/appserv-tests/devtests/connector/threadpool/app/src/beans/WorkTestEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/threadpool/app/src/beans/WorkTestEJB.java
@@ -18,10 +18,10 @@
import connector.MyAdminObject;
import javax.rmi.PortableRemoteObject;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
-import javax.ejb.CreateException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.CreateException;
import java.rmi.RemoteException;
import javax.naming.*;
diff --git a/appserver/tests/appserv-tests/devtests/connector/threadpool/app/src/beans/WorkTestHome.java b/appserver/tests/appserv-tests/devtests/connector/threadpool/app/src/beans/WorkTestHome.java
index 365b123..5c20b4c 100644
--- a/appserver/tests/appserv-tests/devtests/connector/threadpool/app/src/beans/WorkTestHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/threadpool/app/src/beans/WorkTestHome.java
@@ -17,8 +17,8 @@
package beans;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface WorkTestHome extends EJBHome {
WorkTest create() throws RemoteException, CreateException;
diff --git a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ejb/SimpleSession.java b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ejb/SimpleSession.java
index 44f23d7..5af8bd2 100644
--- a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ejb/SimpleSession.java
+++ b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ejb/SimpleSession.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.connector.txlevelswitch.test1.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleSession extends EJBObject {
diff --git a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ejb/SimpleSessionBean.java
index 5fa8b39..76fc38c 100644
--- a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ejb/SimpleSessionBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.connector.txlevelswitch.test1.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.rmi.*;
diff --git a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ejb/SimpleSessionHome.java b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ejb/SimpleSessionHome.java
index bbb18d6..703f331 100644
--- a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ejb/SimpleSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ejb/SimpleSessionHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.connector.txlevelswitch.test1.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleSessionHome extends EJBHome
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/ejb/CoffeeBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/ejb/CoffeeBean.java
index 379da94..f9fc3ef 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/ejb/CoffeeBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/ejb/CoffeeBean.java
@@ -18,7 +18,7 @@
import java.math.BigDecimal;
import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.resource.cci.*;
import javax.resource.ResourceException;
import javax.naming.*;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/ejb/CoffeeRemote.java b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/ejb/CoffeeRemote.java
index 4c0b4da..1c90c1c 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/ejb/CoffeeRemote.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/ejb/CoffeeRemote.java
@@ -16,7 +16,7 @@
package com.sun.s1peqe.connector.cci;
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
public interface CoffeeRemote extends EJBLocalObject {
public void insertCoffee(String name, int quantity);
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/ejb/CoffeeRemoteHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/ejb/CoffeeRemoteHome.java
index 522b112..2bf98f4 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/ejb/CoffeeRemoteHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/ejb/CoffeeRemoteHome.java
@@ -16,8 +16,8 @@
package com.sun.s1peqe.connector.cci;
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
public interface CoffeeRemoteHome extends EJBLocalHome {
CoffeeRemote create() throws CreateException;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/ejb/CoffeeBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/ejb/CoffeeBean.java
index 0821967..bc6b36c 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/ejb/CoffeeBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/ejb/CoffeeBean.java
@@ -18,7 +18,7 @@
import java.math.BigDecimal;
import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.resource.cci.*;
import javax.resource.ResourceException;
import javax.naming.*;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/ejb/CoffeeRemote.java b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/ejb/CoffeeRemote.java
index 4c0b4da..1c90c1c 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/ejb/CoffeeRemote.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/ejb/CoffeeRemote.java
@@ -16,7 +16,7 @@
package com.sun.s1peqe.connector.cci;
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
public interface CoffeeRemote extends EJBLocalObject {
public void insertCoffee(String name, int quantity);
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/ejb/CoffeeRemoteHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/ejb/CoffeeRemoteHome.java
index 522b112..2bf98f4 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/ejb/CoffeeRemoteHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/ejb/CoffeeRemoteHome.java
@@ -16,8 +16,8 @@
package com.sun.s1peqe.connector.cci;
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
public interface CoffeeRemoteHome extends EJBLocalHome {
CoffeeRemote create() throws CreateException;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ejb/HelloEJB.java
index c699a2b..4ff0a9d 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ejb/HelloEJB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.hello.session3;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import javax.naming.InitialContext;
import javax.resource.AdministeredObjectDefinitions;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ejb/HelloStatefulEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ejb/HelloStatefulEJB.java
index f67a7ad..5959a75 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ejb/HelloStatefulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ejb/HelloStatefulEJB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.hello.session3;
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
import jakarta.annotation.PostConstruct;
import javax.resource.AdministeredObjectDefinitions;
import javax.resource.AdministeredObjectDefinition;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/servlet/Servlet.java b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/servlet/Servlet.java
index adc03dd..4e17586 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/servlet/Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/servlet/Servlet.java
@@ -24,9 +24,9 @@
import javax.servlet.http.*;
import javax.servlet.annotation.*;
import javax.naming.*;
-import javax.ejb.EJB;
-import javax.ejb.EJBs;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBs;
+import jakarta.ejb.EJBException;
import jakarta.annotation.Resource;
import javax.transaction.UserTransaction;
@@ -173,7 +173,7 @@
sleepFor(2);
helloStateful.ping();
//throw new EJBException("Did not get ConcurrentAccessException");
- } catch (javax.ejb.ConcurrentAccessException conEx) {
+ } catch (jakarta.ejb.ConcurrentAccessException conEx) {
; //Everything is fine
} catch (Throwable th) {
throw new EJBException("Got some wierd exception: " + th);
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ejb/HelloEJB.java
index 6e72a41..26a4938 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ejb/HelloEJB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.hello.session3;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import javax.naming.InitialContext;
import javax.resource.AdministeredObjectDefinitions;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ejb/HelloStatefulEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ejb/HelloStatefulEJB.java
index 45e597f..537ac7a 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ejb/HelloStatefulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ejb/HelloStatefulEJB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.hello.session3;
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
import jakarta.annotation.PostConstruct;
import javax.resource.AdministeredObjectDefinitions;
import javax.resource.AdministeredObjectDefinition;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/servlet/Servlet.java b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/servlet/Servlet.java
index d0b3070..19e71f6 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/servlet/Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/servlet/Servlet.java
@@ -24,9 +24,9 @@
import javax.servlet.http.*;
import javax.servlet.annotation.*;
import javax.naming.*;
-import javax.ejb.EJB;
-import javax.ejb.EJBs;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBs;
+import jakarta.ejb.EJBException;
import jakarta.annotation.Resource;
import javax.transaction.UserTransaction;
@@ -173,7 +173,7 @@
sleepFor(2);
helloStateful.ping();
//throw new EJBException("Did not get ConcurrentAccessException");
- } catch (javax.ejb.ConcurrentAccessException conEx) {
+ } catch (jakarta.ejb.ConcurrentAccessException conEx) {
; //Everything is fine
} catch (Throwable th) {
throw new EJBException("Got some wierd exception: " + th);
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/beans/MessageChecker.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/beans/MessageChecker.java
index 6a242b0..bf24dbd 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/beans/MessageChecker.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/beans/MessageChecker.java
@@ -16,7 +16,7 @@
package beans;
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
public interface MessageChecker extends EJBLocalObject {
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/beans/MessageCheckerEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/beans/MessageCheckerEJB.java
index fa5e1c8..bbabbb3 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/beans/MessageCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/beans/MessageCheckerEJB.java
@@ -17,10 +17,10 @@
package beans;
import connector.MyAdminObject;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
-import javax.ejb.CreateException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.CreateException;
import java.util.Properties;
import java.sql.*;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/beans/MessageCheckerHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/beans/MessageCheckerHome.java
index e9bc945..dd09451 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/beans/MessageCheckerHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/beans/MessageCheckerHome.java
@@ -16,8 +16,8 @@
package beans;
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
public interface MessageCheckerHome extends EJBLocalHome {
MessageChecker create() throws CreateException;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/mdb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/mdb/MyMessageBean.java
index cb0d388..5eb4b43 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/mdb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/mdb/MyMessageBean.java
@@ -17,7 +17,7 @@
package mdb;
import connector.MyMessageListener;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.servlet.*;
import javax.servlet.http.*;
@@ -43,7 +43,7 @@
/**
* setMessageDrivenContext method, declared as public (but
* not final or static), with a return type of void, and
- * with one argument of type javax.ejb.MessageDrivenContext.
+ * with one argument of type jakarta.ejb.MessageDrivenContext.
*
* @param mdc the context to set
*/
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/app/src/beans/MessageChecker.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/app/src/beans/MessageChecker.java
index 6a242b0..bf24dbd 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/app/src/beans/MessageChecker.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/app/src/beans/MessageChecker.java
@@ -16,7 +16,7 @@
package beans;
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
public interface MessageChecker extends EJBLocalObject {
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/app/src/beans/MessageCheckerEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/app/src/beans/MessageCheckerEJB.java
index d2c3930..8fd15e1 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/app/src/beans/MessageCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/app/src/beans/MessageCheckerEJB.java
@@ -17,10 +17,10 @@
package beans;
import connector.MyAdminObject;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
-import javax.ejb.CreateException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.CreateException;
import java.util.Properties;
import java.sql.*;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/app/src/beans/MessageCheckerHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/app/src/beans/MessageCheckerHome.java
index e9bc945..dd09451 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/app/src/beans/MessageCheckerHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/app/src/beans/MessageCheckerHome.java
@@ -16,8 +16,8 @@
package beans;
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
public interface MessageCheckerHome extends EJBLocalHome {
MessageChecker create() throws CreateException;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/app/src/mdb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/app/src/mdb/MyMessageBean.java
index 467425a..a1d760b 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/app/src/mdb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/app/src/mdb/MyMessageBean.java
@@ -17,7 +17,7 @@
package mdb;
import connector.MyMessageListener;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import java.io.*;
import java.rmi.RemoteException;
@@ -45,7 +45,7 @@
/**
* setMessageDrivenContext method, declared as public (but
* not final or static), with a return type of void, and
- * with one argument of type javax.ejb.MessageDrivenContext.
+ * with one argument of type jakarta.ejb.MessageDrivenContext.
*
* @param mdc the context to set
*/
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/Customer.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/Customer.java
index 8ab633b..8a9b105 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/Customer.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/Customer.java
@@ -16,7 +16,7 @@
package samples.ejb.subclassing.ejb;
-public interface Customer extends javax.ejb.EJBLocalObject
+public interface Customer extends jakarta.ejb.EJBLocalObject
{
public String getLastName() ;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerCheckingEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerCheckingEJB.java
index b3b9bc1..ee0d17c 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerCheckingEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerCheckingEJB.java
@@ -16,7 +16,7 @@
package samples.ejb.subclassing.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import java.sql.*;
import javax.sql.DataSource;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerCheckingLocalHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerCheckingLocalHome.java
index 5bc95ba..a7deaa1 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerCheckingLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerCheckingLocalHome.java
@@ -17,8 +17,8 @@
package samples.ejb.subclassing.ejb;
public interface CustomerCheckingLocalHome extends CustomerLocalHome {
- public CustomerChecking create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws javax.ejb.CreateException;
+ public CustomerChecking create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws jakarta.ejb.CreateException;
- public CustomerChecking findByPrimaryKey(String SSN) throws javax.ejb.FinderException;
+ public CustomerChecking findByPrimaryKey(String SSN) throws jakarta.ejb.FinderException;
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerEJB.java
index f96c315..f0dbad2 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerEJB.java
@@ -16,12 +16,12 @@
package samples.ejb.subclassing.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import java.sql.*;
import javax.sql.DataSource;
-public class CustomerEJB implements javax.ejb.EntityBean
+public class CustomerEJB implements jakarta.ejb.EntityBean
{
//database fields
String SSN;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerLocalHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerLocalHome.java
index cd8f522..ba8264d 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerLocalHome.java
@@ -16,9 +16,9 @@
package samples.ejb.subclassing.ejb;
-import javax.ejb.EJBLocalHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
-public interface CustomerLocalHome extends javax.ejb.EJBLocalHome {
+public interface CustomerLocalHome extends jakarta.ejb.EJBLocalHome {
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerSavingsEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerSavingsEJB.java
index 199aa62..f30b506 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerSavingsEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerSavingsEJB.java
@@ -16,7 +16,7 @@
package samples.ejb.subclassing.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import java.sql.*;
import javax.sql.DataSource;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerSavingsLocalHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerSavingsLocalHome.java
index 9a9a25f..4179122 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerSavingsLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerSavingsLocalHome.java
@@ -17,8 +17,8 @@
package samples.ejb.subclassing.ejb;
public interface CustomerSavingsLocalHome extends CustomerLocalHome {
- public CustomerSavings create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws javax.ejb.CreateException;
+ public CustomerSavings create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws jakarta.ejb.CreateException;
- public CustomerSavings findByPrimaryKey(String SSN) throws javax.ejb.FinderException;
+ public CustomerSavings findByPrimaryKey(String SSN) throws jakarta.ejb.FinderException;
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/servlet/SimpleBankServlet.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/servlet/SimpleBankServlet.java
index 5da9d2e..3fdf39c 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/servlet/SimpleBankServlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/servlet/SimpleBankServlet.java
@@ -21,7 +21,7 @@
import javax.servlet.*;
import javax.naming.*;
import javax.servlet.http.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import samples.ejb.subclassing.ejb.*;
import com.sun.jdbcra.spi.JdbcSetupAdmin;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/beans/MessageChecker.java b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/beans/MessageChecker.java
index 4e8f7f1..8f68ddf 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/beans/MessageChecker.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/beans/MessageChecker.java
@@ -16,7 +16,7 @@
package beans;
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
public interface MessageChecker extends EJBLocalObject {
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/beans/MessageCheckerEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/beans/MessageCheckerEJB.java
index 6db25c4..702f0d8 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/beans/MessageCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/beans/MessageCheckerEJB.java
@@ -17,10 +17,10 @@
package beans;
import connector.MyAdminObject;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
-import javax.ejb.CreateException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.CreateException;
import java.util.Properties;
import java.sql.*;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/beans/MessageCheckerHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/beans/MessageCheckerHome.java
index e9bc945..dd09451 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/beans/MessageCheckerHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/beans/MessageCheckerHome.java
@@ -16,8 +16,8 @@
package beans;
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
public interface MessageCheckerHome extends EJBLocalHome {
MessageChecker create() throws CreateException;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/mdb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/mdb/MyMessageBean.java
index d6950b7..cdf3dcb 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/mdb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/mdb/MyMessageBean.java
@@ -17,7 +17,7 @@
package mdb;
import connector.MyMessageListener;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.servlet.*;
import javax.servlet.http.*;
@@ -43,7 +43,7 @@
/**
* setMessageDrivenContext method, declared as public (but
* not final or static), with a return type of void, and
- * with one argument of type javax.ejb.MessageDrivenContext.
+ * with one argument of type jakarta.ejb.MessageDrivenContext.
*
* @param mdc the context to set
*/
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/app/src/beans/MessageChecker.java b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/app/src/beans/MessageChecker.java
index 9d76881..bfca37a 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/app/src/beans/MessageChecker.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/app/src/beans/MessageChecker.java
@@ -16,7 +16,7 @@
package beans;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
import java.rmi.RemoteException;
import java.sql.SQLException;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/app/src/beans/MessageCheckerEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/app/src/beans/MessageCheckerEJB.java
index efa2125..4a46e3c 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/app/src/beans/MessageCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/app/src/beans/MessageCheckerEJB.java
@@ -18,7 +18,7 @@
import connector.MyAdminObject;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.util.Properties;
import java.sql.*;
import java.rmi.RemoteException;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/app/src/beans/MessageCheckerHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/app/src/beans/MessageCheckerHome.java
index dfc3820..e25e135 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/app/src/beans/MessageCheckerHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/app/src/beans/MessageCheckerHome.java
@@ -17,8 +17,8 @@
package beans;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface MessageCheckerHome extends EJBHome {
MessageChecker create() throws RemoteException, CreateException;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/app/src/mdb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/app/src/mdb/MyMessageBean.java
index bc32dc0..e5db294 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/app/src/mdb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/app/src/mdb/MyMessageBean.java
@@ -17,7 +17,7 @@
package mdb;
import connector.MyMessageListener;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.servlet.*;
import javax.servlet.http.*;
@@ -43,7 +43,7 @@
/**
* setMessageDrivenContext method, declared as public (but
* not final or static), with a return type of void, and
- * with one argument of type javax.ejb.MessageDrivenContext.
+ * with one argument of type jakarta.ejb.MessageDrivenContext.
*
* @param mdc the context to set
*/
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/app/src/beans/MessageChecker.java b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/app/src/beans/MessageChecker.java
index 9d76881..bfca37a 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/app/src/beans/MessageChecker.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/app/src/beans/MessageChecker.java
@@ -16,7 +16,7 @@
package beans;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
import java.rmi.RemoteException;
import java.sql.SQLException;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/app/src/beans/MessageCheckerEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/app/src/beans/MessageCheckerEJB.java
index 933be01..5231d9b 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/app/src/beans/MessageCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/app/src/beans/MessageCheckerEJB.java
@@ -18,7 +18,7 @@
import connector.MyAdminObject;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.util.Properties;
import java.sql.*;
import java.rmi.RemoteException;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/app/src/beans/MessageCheckerHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/app/src/beans/MessageCheckerHome.java
index dfc3820..e25e135 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/app/src/beans/MessageCheckerHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/app/src/beans/MessageCheckerHome.java
@@ -17,8 +17,8 @@
package beans;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface MessageCheckerHome extends EJBHome {
MessageChecker create() throws RemoteException, CreateException;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/app/src/mdb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/app/src/mdb/MyMessageBean.java
index bc32dc0..e5db294 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/app/src/mdb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/app/src/mdb/MyMessageBean.java
@@ -17,7 +17,7 @@
package mdb;
import connector.MyMessageListener;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.servlet.*;
import javax.servlet.http.*;
@@ -43,7 +43,7 @@
/**
* setMessageDrivenContext method, declared as public (but
* not final or static), with a return type of void, and
- * with one argument of type javax.ejb.MessageDrivenContext.
+ * with one argument of type jakarta.ejb.MessageDrivenContext.
*
* @param mdc the context to set
*/
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources-resources-xml/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources-resources-xml/ejb/SimpleBMP.java
index a7bcfba..c94e7ea 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources-resources-xml/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources-resources-xml/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.CustomResourceFactories.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
import java.util.Properties;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources-resources-xml/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources-resources-xml/ejb/SimpleBMPBean.java
index 600b614..6068415 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources-resources-xml/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources-resources-xml/ejb/SimpleBMPBean.java
@@ -18,7 +18,7 @@
import com.sun.s1asdev.custom.resource.CustomResourceJavaBean;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.sql.*;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources-resources-xml/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources-resources-xml/ejb/SimpleBMPHome.java
index a7e3374..e703735 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources-resources-xml/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources-resources-xml/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.CustomResourceFactories.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMPHome
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources/ejb/SimpleBMP.java
index 576cc1b..8cab5e4 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.CustomResourceFactories.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
import java.util.Properties;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources/ejb/SimpleBMPBean.java
index 0c9e83d..e3659e3 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources/ejb/SimpleBMPBean.java
@@ -19,7 +19,7 @@
import com.sun.s1asdev.custom.resource.CustomResourceJavaBean;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import java.rmi.RemoteException;
import java.sql.*;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources/ejb/SimpleBMPHome.java
index a7e3374..e703735 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.CustomResourceFactories.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMPHome
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/ejb/SimpleSession.java b/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/ejb/SimpleSession.java
index d298e6c..e862cae 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/ejb/SimpleSession.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/ejb/SimpleSession.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.connector.serializabletest.ejb;
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
public interface SimpleSession extends EJBLocalObject {
public boolean test1() ;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/ejb/SimpleSessionBean.java
index 633fd36..37f378b 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/ejb/SimpleSessionBean.java
@@ -16,8 +16,8 @@
package com.sun.s1asdev.connector.serializabletest.ejb;
-import javax.ejb.EJBContext;
-import javax.ejb.SessionBean;
+import jakarta.ejb.EJBContext;
+import jakarta.ejb.SessionBean;
import javax.naming.InitialContext;
import java.sql.Connection;
import java.sql.ResultSet;
@@ -26,11 +26,11 @@
public class SimpleSessionBean implements SessionBean {
private EJBContext ejbcontext;
- private transient javax.ejb.SessionContext m_ctx = null;
+ private transient jakarta.ejb.SessionContext m_ctx = null;
transient javax.sql.DataSource ds;
- public void setSessionContext(javax.ejb.SessionContext ctx) {
+ public void setSessionContext(jakarta.ejb.SessionContext ctx) {
m_ctx = ctx;
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/ejb/SimpleSessionHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/ejb/SimpleSessionHome.java
index 6a9f389..0a39173 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/ejb/SimpleSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/ejb/SimpleSessionHome.java
@@ -16,8 +16,8 @@
package com.sun.s1asdev.connector.serializabletest.ejb;
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
public interface SimpleSessionHome extends EJBLocalHome {
SimpleSession create()
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/servlet/SimpleServlet.java b/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/servlet/SimpleServlet.java
index b40a3f1..1a8b7f4 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/servlet/SimpleServlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/servlet/SimpleServlet.java
@@ -22,7 +22,7 @@
import javax.servlet.ServletException;
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import javax.ejb.CreateException;
+import jakarta.ejb.CreateException;
import java.io.IOException;
import java.io.PrintWriter;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ejb/HelloEJB.java
index ccd9727..28d40a8 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ejb/HelloEJB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.hello.session3;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import javax.naming.InitialContext;
import javax.resource.ConnectionFactoryDefinitions;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ejb/HelloStatefulEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ejb/HelloStatefulEJB.java
index 185e638..7dc137e 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ejb/HelloStatefulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ejb/HelloStatefulEJB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.hello.session3;
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
import jakarta.annotation.PostConstruct;
import javax.resource.ConnectionFactoryDefinitions;
import javax.resource.ConnectionFactoryDefinition;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/servlet/Servlet.java b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/servlet/Servlet.java
index 659e1ba..4069f24 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/servlet/Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/servlet/Servlet.java
@@ -27,9 +27,9 @@
import javax.servlet.http.*;
import javax.servlet.annotation.*;
import javax.naming.*;
-import javax.ejb.EJB;
-import javax.ejb.EJBs;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBs;
+import jakarta.ejb.EJBException;
import jakarta.annotation.Resource;
import javax.transaction.UserTransaction;
@@ -175,7 +175,7 @@
sleepFor(2);
helloStateful.ping();
//throw new EJBException("Did not get ConcurrentAccessException");
- } catch (javax.ejb.ConcurrentAccessException conEx) {
+ } catch (jakarta.ejb.ConcurrentAccessException conEx) {
; //Everything is fine
} catch (Throwable th) {
throw new EJBException("Got some wierd exception: " + th);
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ejb/HelloEJB.java
index 55cc253..96beb4c 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ejb/HelloEJB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.hello.session3;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import javax.naming.InitialContext;
import javax.resource.ConnectionFactoryDefinitions;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ejb/HelloStatefulEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ejb/HelloStatefulEJB.java
index ad40503..c1e1b3f 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ejb/HelloStatefulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ejb/HelloStatefulEJB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.hello.session3;
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
import jakarta.annotation.PostConstruct;
import javax.resource.ConnectionFactoryDefinitions;
import javax.resource.ConnectionFactoryDefinition;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/servlet/Servlet.java b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/servlet/Servlet.java
index f4eb29a..8a597e8 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/servlet/Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/servlet/Servlet.java
@@ -27,9 +27,9 @@
import javax.servlet.http.*;
import javax.servlet.annotation.*;
import javax.naming.*;
-import javax.ejb.EJB;
-import javax.ejb.EJBs;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBs;
+import jakarta.ejb.EJBException;
import jakarta.annotation.Resource;
import javax.transaction.UserTransaction;
@@ -175,7 +175,7 @@
sleepFor(2);
helloStateful.ping();
//throw new EJBException("Did not get ConcurrentAccessException");
- } catch (javax.ejb.ConcurrentAccessException conEx) {
+ } catch (jakarta.ejb.ConcurrentAccessException conEx) {
; //Everything is fine
} catch (Throwable th) {
throw new EJBException("Got some wierd exception: " + th);
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/app/src/beans/MessageChecker.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/app/src/beans/MessageChecker.java
index 6a242b0..bf24dbd 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/app/src/beans/MessageChecker.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/app/src/beans/MessageChecker.java
@@ -16,7 +16,7 @@
package beans;
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
public interface MessageChecker extends EJBLocalObject {
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/app/src/beans/MessageCheckerEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/app/src/beans/MessageCheckerEJB.java
index d2c3930..8fd15e1 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/app/src/beans/MessageCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/app/src/beans/MessageCheckerEJB.java
@@ -17,10 +17,10 @@
package beans;
import connector.MyAdminObject;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
-import javax.ejb.CreateException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.CreateException;
import java.util.Properties;
import java.sql.*;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/app/src/beans/MessageCheckerHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/app/src/beans/MessageCheckerHome.java
index e9bc945..dd09451 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/app/src/beans/MessageCheckerHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/app/src/beans/MessageCheckerHome.java
@@ -16,8 +16,8 @@
package beans;
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
public interface MessageCheckerHome extends EJBLocalHome {
MessageChecker create() throws CreateException;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/app/src/mdb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/app/src/mdb/MyMessageBean.java
index bc32dc0..e5db294 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/app/src/mdb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/app/src/mdb/MyMessageBean.java
@@ -17,7 +17,7 @@
package mdb;
import connector.MyMessageListener;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.servlet.*;
import javax.servlet.http.*;
@@ -43,7 +43,7 @@
/**
* setMessageDrivenContext method, declared as public (but
* not final or static), with a return type of void, and
- * with one argument of type javax.ejb.MessageDrivenContext.
+ * with one argument of type jakarta.ejb.MessageDrivenContext.
*
* @param mdc the context to set
*/
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/beans/MessageChecker.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/beans/MessageChecker.java
index 4e8f7f1..8f68ddf 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/beans/MessageChecker.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/beans/MessageChecker.java
@@ -16,7 +16,7 @@
package beans;
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
public interface MessageChecker extends EJBLocalObject {
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/beans/MessageCheckerEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/beans/MessageCheckerEJB.java
index 8c2cd64..071bca7 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/beans/MessageCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/beans/MessageCheckerEJB.java
@@ -17,10 +17,10 @@
package beans;
import connector.MyAdminObject;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
-import javax.ejb.CreateException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.CreateException;
import java.util.Properties;
import java.sql.*;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/beans/MessageCheckerHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/beans/MessageCheckerHome.java
index e9bc945..dd09451 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/beans/MessageCheckerHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/beans/MessageCheckerHome.java
@@ -16,8 +16,8 @@
package beans;
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
public interface MessageCheckerHome extends EJBLocalHome {
MessageChecker create() throws CreateException;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/mdb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/mdb/MyMessageBean.java
index 9e1ec9c..7283014 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/mdb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/mdb/MyMessageBean.java
@@ -17,7 +17,7 @@
package mdb;
import connector.MyMessageListener;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import java.io.*;
import java.rmi.RemoteException;
@@ -45,7 +45,7 @@
/**
* setMessageDrivenContext method, declared as public (but
* not final or static), with a return type of void, and
- * with one argument of type javax.ejb.MessageDrivenContext.
+ * with one argument of type jakarta.ejb.MessageDrivenContext.
*
* @param mdc the context to set
*/
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/app/src/beans/MessageChecker.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/app/src/beans/MessageChecker.java
index 4e8f7f1..8f68ddf 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/app/src/beans/MessageChecker.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/app/src/beans/MessageChecker.java
@@ -16,7 +16,7 @@
package beans;
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
public interface MessageChecker extends EJBLocalObject {
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/app/src/beans/MessageCheckerEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/app/src/beans/MessageCheckerEJB.java
index 8c2cd64..071bca7 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/app/src/beans/MessageCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/app/src/beans/MessageCheckerEJB.java
@@ -17,10 +17,10 @@
package beans;
import connector.MyAdminObject;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
-import javax.ejb.CreateException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.CreateException;
import java.util.Properties;
import java.sql.*;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/app/src/beans/MessageCheckerHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/app/src/beans/MessageCheckerHome.java
index e9bc945..dd09451 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/app/src/beans/MessageCheckerHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/app/src/beans/MessageCheckerHome.java
@@ -16,8 +16,8 @@
package beans;
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
public interface MessageCheckerHome extends EJBLocalHome {
MessageChecker create() throws CreateException;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/app/src/mdb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/app/src/mdb/MyMessageBean.java
index 9e1ec9c..7283014 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/app/src/mdb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/app/src/mdb/MyMessageBean.java
@@ -17,7 +17,7 @@
package mdb;
import connector.MyMessageListener;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import java.io.*;
import java.rmi.RemoteException;
@@ -45,7 +45,7 @@
/**
* setMessageDrivenContext method, declared as public (but
* not final or static), with a return type of void, and
- * with one argument of type javax.ejb.MessageDrivenContext.
+ * with one argument of type jakarta.ejb.MessageDrivenContext.
*
* @param mdc the context to set
*/
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/custom-resources-gf-resources-module-scoped/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/connector/v3/custom-resources-gf-resources-module-scoped/ejb/SimpleBMP.java
index a7bcfba..c94e7ea 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/custom-resources-gf-resources-module-scoped/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/custom-resources-gf-resources-module-scoped/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.CustomResourceFactories.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
import java.util.Properties;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/custom-resources-gf-resources-module-scoped/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/custom-resources-gf-resources-module-scoped/ejb/SimpleBMPBean.java
index 600b614..6068415 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/custom-resources-gf-resources-module-scoped/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/custom-resources-gf-resources-module-scoped/ejb/SimpleBMPBean.java
@@ -18,7 +18,7 @@
import com.sun.s1asdev.custom.resource.CustomResourceJavaBean;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.sql.*;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/custom-resources-gf-resources-module-scoped/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/custom-resources-gf-resources-module-scoped/ejb/SimpleBMPHome.java
index a7e3374..e703735 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/custom-resources-gf-resources-module-scoped/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/custom-resources-gf-resources-module-scoped/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.CustomResourceFactories.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMPHome
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/datasource-definition/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/datasource-definition/ejb/HelloEJB.java
index 1c9d796..e7eb489 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/datasource-definition/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/datasource-definition/ejb/HelloEJB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.hello.session3;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import javax.persistence.EntityManagerFactory;
import javax.persistence.PersistenceUnit;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/datasource-definition/ejb/HelloStatefulEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/datasource-definition/ejb/HelloStatefulEJB.java
index 5bbf7d8..db30d12 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/datasource-definition/ejb/HelloStatefulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/datasource-definition/ejb/HelloStatefulEJB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.hello.session3;
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
import jakarta.annotation.PostConstruct;
import jakarta.annotation.sql.*;
import java.sql.*;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/datasource-definition/servlet/Servlet.java b/appserver/tests/appserv-tests/devtests/connector/v3/datasource-definition/servlet/Servlet.java
index 0455254..67aa6c6 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/datasource-definition/servlet/Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/datasource-definition/servlet/Servlet.java
@@ -20,9 +20,9 @@
import javax.servlet.*;
import javax.servlet.http.*;
import javax.naming.*;
-import javax.ejb.EJB;
-import javax.ejb.EJBs;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBs;
+import jakarta.ejb.EJBException;
import jakarta.annotation.Resource;
import jakarta.annotation.Resources;
import javax.sql.DataSource;
@@ -207,7 +207,7 @@
sleepFor(2);
helloStateful.ping();
//throw new EJBException("Did not get ConcurrentAccessException");
- } catch (javax.ejb.ConcurrentAccessException conEx) {
+ } catch (jakarta.ejb.ConcurrentAccessException conEx) {
; //Everything is fine
} catch (Throwable th) {
throw new EJBException("Got some wierd exception: " + th);
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/app/src/beans/MessageChecker.java b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/app/src/beans/MessageChecker.java
index 5821cbe..5f5e16d 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/app/src/beans/MessageChecker.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/app/src/beans/MessageChecker.java
@@ -16,7 +16,7 @@
package beans;
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
public interface MessageChecker extends EJBLocalObject {
int getMessageCount();
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/app/src/beans/MessageCheckerEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/app/src/beans/MessageCheckerEJB.java
index b39584b..21a82d7 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/app/src/beans/MessageCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/app/src/beans/MessageCheckerEJB.java
@@ -18,10 +18,10 @@
import connector.MyAdminObject;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
-import javax.ejb.CreateException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.CreateException;
import java.util.Properties;
import java.sql.*;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/app/src/beans/MessageCheckerHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/app/src/beans/MessageCheckerHome.java
index 11b69f9..f5c8f22 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/app/src/beans/MessageCheckerHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/app/src/beans/MessageCheckerHome.java
@@ -16,8 +16,8 @@
package beans;
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
public interface MessageCheckerHome extends EJBLocalHome {
MessageChecker create() throws CreateException;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/app/src/mdb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/app/src/mdb/MyMessageBean.java
index cf1877b..7a40e6e 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/app/src/mdb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/app/src/mdb/MyMessageBean.java
@@ -18,7 +18,7 @@
import connector.MyMessageListener;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.servlet.*;
import javax.servlet.http.*;
@@ -45,7 +45,7 @@
/**
* setMessageDrivenContext method, declared as public (but
* not final or static), with a return type of void, and
- * with one argument of type javax.ejb.MessageDrivenContext.
+ * with one argument of type jakarta.ejb.MessageDrivenContext.
*
* @param mdc the context to set
*/
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/src/beans/MessageChecker.java b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/src/beans/MessageChecker.java
index 5821cbe..5f5e16d 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/src/beans/MessageChecker.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/src/beans/MessageChecker.java
@@ -16,7 +16,7 @@
package beans;
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
public interface MessageChecker extends EJBLocalObject {
int getMessageCount();
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/src/beans/MessageCheckerEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/src/beans/MessageCheckerEJB.java
index 32f2e0a..1392691 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/src/beans/MessageCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/src/beans/MessageCheckerEJB.java
@@ -18,10 +18,10 @@
import connector.MyAdminObject;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
-import javax.ejb.CreateException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.CreateException;
import java.util.Properties;
import java.sql.*;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/src/beans/MessageCheckerHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/src/beans/MessageCheckerHome.java
index 11b69f9..f5c8f22 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/src/beans/MessageCheckerHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/src/beans/MessageCheckerHome.java
@@ -16,8 +16,8 @@
package beans;
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
public interface MessageCheckerHome extends EJBLocalHome {
MessageChecker create() throws CreateException;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/src/mdb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/src/mdb/MyMessageBean.java
index 1b2cc5a..fb3f307 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/src/mdb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/src/mdb/MyMessageBean.java
@@ -18,7 +18,7 @@
import connector.MyMessageListener;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import java.io.*;
import java.rmi.RemoteException;
@@ -47,7 +47,7 @@
/**
* setMessageDrivenContext method, declared as public (but
* not final or static), with a return type of void, and
- * with one argument of type javax.ejb.MessageDrivenContext.
+ * with one argument of type jakarta.ejb.MessageDrivenContext.
*
* @param mdc the context to set
*/
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/ejb32-mdb/ejb/ModernBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/ejb32-mdb/ejb/ModernBean.java
index 8b3b11c..b6e7a64 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/ejb32-mdb/ejb/ModernBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/ejb32-mdb/ejb/ModernBean.java
@@ -20,9 +20,9 @@
import com.sun.s1asdev.ejb.ejb32.mdb.ra.CommandListener;
import jakarta.annotation.Resource;
-import javax.ejb.EJB;
-import javax.ejb.MessageDriven;
-import javax.ejb.MessageDrivenContext;
+import jakarta.ejb.EJB;
+import jakarta.ejb.MessageDriven;
+import jakarta.ejb.MessageDrivenContext;
import javax.interceptor.Interceptors;
/**
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/ejb32-mdb/ejb/ResultsBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/ejb32-mdb/ejb/ResultsBean.java
index 0236fd3..4622ee1 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/ejb32-mdb/ejb/ResultsBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/ejb32-mdb/ejb/ResultsBean.java
@@ -16,10 +16,10 @@
package com.sun.s1asdev.ejb.ejb32.mdb.ejb;
-import javax.ejb.LocalBean;
-import javax.ejb.Lock;
-import javax.ejb.LockType;
-import javax.ejb.Singleton;
+import jakarta.ejb.LocalBean;
+import jakarta.ejb.Lock;
+import jakarta.ejb.LockType;
+import jakarta.ejb.Singleton;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CountDownLatch;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/ejb32-mdb/ejb/ResultsRemote.java b/appserver/tests/appserv-tests/devtests/connector/v3/ejb32-mdb/ejb/ResultsRemote.java
index 77808c0..828f191 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/ejb32-mdb/ejb/ResultsRemote.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/ejb32-mdb/ejb/ResultsRemote.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb32.mdb.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
import java.util.List;
/**
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/Customer.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/Customer.java
index 8ab633b..8a9b105 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/Customer.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/Customer.java
@@ -16,7 +16,7 @@
package samples.ejb.subclassing.ejb;
-public interface Customer extends javax.ejb.EJBLocalObject
+public interface Customer extends jakarta.ejb.EJBLocalObject
{
public String getLastName() ;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerCheckingEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerCheckingEJB.java
index b3b9bc1..ee0d17c 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerCheckingEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerCheckingEJB.java
@@ -16,7 +16,7 @@
package samples.ejb.subclassing.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import java.sql.*;
import javax.sql.DataSource;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerCheckingLocalHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerCheckingLocalHome.java
index 5bc95ba..a7deaa1 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerCheckingLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerCheckingLocalHome.java
@@ -17,8 +17,8 @@
package samples.ejb.subclassing.ejb;
public interface CustomerCheckingLocalHome extends CustomerLocalHome {
- public CustomerChecking create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws javax.ejb.CreateException;
+ public CustomerChecking create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws jakarta.ejb.CreateException;
- public CustomerChecking findByPrimaryKey(String SSN) throws javax.ejb.FinderException;
+ public CustomerChecking findByPrimaryKey(String SSN) throws jakarta.ejb.FinderException;
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerEJB.java
index a0145ab..0520b60 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerEJB.java
@@ -16,12 +16,12 @@
package samples.ejb.subclassing.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import java.sql.*;
import javax.sql.DataSource;
-public class CustomerEJB implements javax.ejb.EntityBean
+public class CustomerEJB implements jakarta.ejb.EntityBean
{
//database fields
String SSN;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerLocalHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerLocalHome.java
index cd8f522..ba8264d 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerLocalHome.java
@@ -16,9 +16,9 @@
package samples.ejb.subclassing.ejb;
-import javax.ejb.EJBLocalHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
-public interface CustomerLocalHome extends javax.ejb.EJBLocalHome {
+public interface CustomerLocalHome extends jakarta.ejb.EJBLocalHome {
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerSavingsEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerSavingsEJB.java
index 199aa62..f30b506 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerSavingsEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerSavingsEJB.java
@@ -16,7 +16,7 @@
package samples.ejb.subclassing.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import java.sql.*;
import javax.sql.DataSource;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerSavingsLocalHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerSavingsLocalHome.java
index 9a9a25f..4179122 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerSavingsLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerSavingsLocalHome.java
@@ -17,8 +17,8 @@
package samples.ejb.subclassing.ejb;
public interface CustomerSavingsLocalHome extends CustomerLocalHome {
- public CustomerSavings create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws javax.ejb.CreateException;
+ public CustomerSavings create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws jakarta.ejb.CreateException;
- public CustomerSavings findByPrimaryKey(String SSN) throws javax.ejb.FinderException;
+ public CustomerSavings findByPrimaryKey(String SSN) throws jakarta.ejb.FinderException;
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/servlet/SimpleBankServlet.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/servlet/SimpleBankServlet.java
index aafc4b5..de8a419 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/servlet/SimpleBankServlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/servlet/SimpleBankServlet.java
@@ -21,7 +21,7 @@
import javax.servlet.*;
import javax.naming.*;
import javax.servlet.http.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import samples.ejb.subclassing.ejb.*;
import com.sun.jdbcra.spi.JdbcSetupAdmin;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/Customer.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/Customer.java
index 8ab633b..8a9b105 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/Customer.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/Customer.java
@@ -16,7 +16,7 @@
package samples.ejb.subclassing.ejb;
-public interface Customer extends javax.ejb.EJBLocalObject
+public interface Customer extends jakarta.ejb.EJBLocalObject
{
public String getLastName() ;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerCheckingEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerCheckingEJB.java
index b3b9bc1..ee0d17c 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerCheckingEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerCheckingEJB.java
@@ -16,7 +16,7 @@
package samples.ejb.subclassing.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import java.sql.*;
import javax.sql.DataSource;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerCheckingLocalHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerCheckingLocalHome.java
index 5bc95ba..a7deaa1 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerCheckingLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerCheckingLocalHome.java
@@ -17,8 +17,8 @@
package samples.ejb.subclassing.ejb;
public interface CustomerCheckingLocalHome extends CustomerLocalHome {
- public CustomerChecking create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws javax.ejb.CreateException;
+ public CustomerChecking create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws jakarta.ejb.CreateException;
- public CustomerChecking findByPrimaryKey(String SSN) throws javax.ejb.FinderException;
+ public CustomerChecking findByPrimaryKey(String SSN) throws jakarta.ejb.FinderException;
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerEJB.java
index a0145ab..0520b60 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerEJB.java
@@ -16,12 +16,12 @@
package samples.ejb.subclassing.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import java.sql.*;
import javax.sql.DataSource;
-public class CustomerEJB implements javax.ejb.EntityBean
+public class CustomerEJB implements jakarta.ejb.EntityBean
{
//database fields
String SSN;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerLocalHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerLocalHome.java
index cd8f522..ba8264d 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerLocalHome.java
@@ -16,9 +16,9 @@
package samples.ejb.subclassing.ejb;
-import javax.ejb.EJBLocalHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
-public interface CustomerLocalHome extends javax.ejb.EJBLocalHome {
+public interface CustomerLocalHome extends jakarta.ejb.EJBLocalHome {
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerSavingsEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerSavingsEJB.java
index 199aa62..f30b506 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerSavingsEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerSavingsEJB.java
@@ -16,7 +16,7 @@
package samples.ejb.subclassing.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import java.sql.*;
import javax.sql.DataSource;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerSavingsLocalHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerSavingsLocalHome.java
index 9a9a25f..4179122 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerSavingsLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerSavingsLocalHome.java
@@ -17,8 +17,8 @@
package samples.ejb.subclassing.ejb;
public interface CustomerSavingsLocalHome extends CustomerLocalHome {
- public CustomerSavings create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws javax.ejb.CreateException;
+ public CustomerSavings create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws jakarta.ejb.CreateException;
- public CustomerSavings findByPrimaryKey(String SSN) throws javax.ejb.FinderException;
+ public CustomerSavings findByPrimaryKey(String SSN) throws jakarta.ejb.FinderException;
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/servlet/SimpleBankServlet.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/servlet/SimpleBankServlet.java
index 5da9d2e..3fdf39c 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/servlet/SimpleBankServlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/servlet/SimpleBankServlet.java
@@ -21,7 +21,7 @@
import javax.servlet.*;
import javax.naming.*;
import javax.servlet.http.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import samples.ejb.subclassing.ejb.*;
import com.sun.jdbcra.spi.JdbcSetupAdmin;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/app/src/ejb/VersionChecker.java b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/app/src/ejb/VersionChecker.java
index 88ba87b..ee22914 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/app/src/ejb/VersionChecker.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/app/src/ejb/VersionChecker.java
@@ -16,7 +16,7 @@
package beans;
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
import java.rmi.RemoteException;
public interface VersionChecker extends EJBLocalObject {
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/app/src/ejb/VersionCheckerEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/app/src/ejb/VersionCheckerEJB.java
index 4417224..a00913a 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/app/src/ejb/VersionCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/app/src/ejb/VersionCheckerEJB.java
@@ -16,9 +16,9 @@
package beans;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.CreateException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.CreateException;
import javax.naming.*;
import com.sun.jdbcra.spi.JdbcSetupAdmin;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/app/src/ejb/VersionCheckerHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/app/src/ejb/VersionCheckerHome.java
index 97fc812..d8dfa47 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/app/src/ejb/VersionCheckerHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/app/src/ejb/VersionCheckerHome.java
@@ -16,8 +16,8 @@
package beans;
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
public interface VersionCheckerHome extends EJBLocalHome {
VersionChecker create() throws CreateException;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ejb/VersionChecker.java b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ejb/VersionChecker.java
index e952419..5635abc 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ejb/VersionChecker.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ejb/VersionChecker.java
@@ -16,7 +16,7 @@
package beans;
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
public interface VersionChecker extends EJBLocalObject {
int getVersion() ;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ejb/VersionCheckerEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ejb/VersionCheckerEJB.java
index 806cfab..372df6d 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ejb/VersionCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ejb/VersionCheckerEJB.java
@@ -17,10 +17,10 @@
package beans;
import javax.rmi.PortableRemoteObject;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
-import javax.ejb.CreateException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.CreateException;
import java.util.Properties;
import java.util.Vector;
import java.sql.*;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ejb/VersionCheckerHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ejb/VersionCheckerHome.java
index 08d8c64..b77b16f 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ejb/VersionCheckerHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ejb/VersionCheckerHome.java
@@ -16,8 +16,8 @@
package beans;
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
public interface VersionCheckerHome extends EJBLocalHome {
VersionChecker create() throws CreateException;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/Customer.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/Customer.java
index 7bfd3b7..ac9c971 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/Customer.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/Customer.java
@@ -16,7 +16,7 @@
package samples.ejb.installed_libraries_embedded.ejb;
-public interface Customer extends javax.ejb.EJBLocalObject
+public interface Customer extends jakarta.ejb.EJBLocalObject
{
public String getLastName() ;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerCheckingEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerCheckingEJB.java
index 3bde644..82c41a6 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerCheckingEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerCheckingEJB.java
@@ -16,7 +16,7 @@
package samples.ejb.installed_libraries_embedded.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import java.sql.*;
import javax.sql.DataSource;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerCheckingLocalHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerCheckingLocalHome.java
index 1265f26..ae8e784 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerCheckingLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerCheckingLocalHome.java
@@ -17,8 +17,8 @@
package samples.ejb.installed_libraries_embedded.ejb;
public interface CustomerCheckingLocalHome extends CustomerLocalHome {
- public CustomerChecking create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws javax.ejb.CreateException;
+ public CustomerChecking create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws jakarta.ejb.CreateException;
- public CustomerChecking findByPrimaryKey(String SSN) throws javax.ejb.FinderException;
+ public CustomerChecking findByPrimaryKey(String SSN) throws jakarta.ejb.FinderException;
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerEJB.java
index 9baca65..0f9c9af 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerEJB.java
@@ -16,12 +16,12 @@
package samples.ejb.installed_libraries_embedded.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import java.sql.*;
import javax.sql.DataSource;
-public class CustomerEJB implements javax.ejb.EntityBean
+public class CustomerEJB implements jakarta.ejb.EntityBean
{
//database fields
String SSN;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerLocalHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerLocalHome.java
index 145b56e..7d762e3 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerLocalHome.java
@@ -16,9 +16,9 @@
package samples.ejb.installed_libraries_embedded.ejb;
-import javax.ejb.EJBLocalHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
-public interface CustomerLocalHome extends javax.ejb.EJBLocalHome {
+public interface CustomerLocalHome extends jakarta.ejb.EJBLocalHome {
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerSavingsEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerSavingsEJB.java
index ef1d1e6..9f5b76b 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerSavingsEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerSavingsEJB.java
@@ -16,7 +16,7 @@
package samples.ejb.installed_libraries_embedded.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import java.sql.*;
import javax.sql.DataSource;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerSavingsLocalHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerSavingsLocalHome.java
index 27c899e..46f7b6b 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerSavingsLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerSavingsLocalHome.java
@@ -17,8 +17,8 @@
package samples.ejb.installed_libraries_embedded.ejb;
public interface CustomerSavingsLocalHome extends CustomerLocalHome {
- public CustomerSavings create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws javax.ejb.CreateException;
+ public CustomerSavings create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws jakarta.ejb.CreateException;
- public CustomerSavings findByPrimaryKey(String SSN) throws javax.ejb.FinderException;
+ public CustomerSavings findByPrimaryKey(String SSN) throws jakarta.ejb.FinderException;
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/servlet/SimpleBankServlet.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/servlet/SimpleBankServlet.java
index cbbbd50..a2f103e 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/servlet/SimpleBankServlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/servlet/SimpleBankServlet.java
@@ -21,7 +21,7 @@
import javax.servlet.*;
import javax.naming.*;
import javax.servlet.http.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import samples.ejb.installed_libraries_embedded.ejb.*;
import com.sun.jdbcra.spi.JdbcSetupAdmin;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/ejb/SimpleSession.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/ejb/SimpleSession.java
index c5d2622..17705ef 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/ejb/SimpleSession.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/ejb/SimpleSession.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.connector.installed_libraries_test.ejb;
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
public interface SimpleSession extends EJBLocalObject {
public boolean test1() ;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/ejb/SimpleSessionBean.java
index 44fed4a..ba123ee 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/ejb/SimpleSessionBean.java
@@ -16,8 +16,8 @@
package com.sun.s1asdev.connector.installed_libraries_test.ejb;
-import javax.ejb.EJBContext;
-import javax.ejb.SessionBean;
+import jakarta.ejb.EJBContext;
+import jakarta.ejb.SessionBean;
import javax.naming.InitialContext;
import java.sql.Connection;
import java.sql.ResultSet;
@@ -26,11 +26,11 @@
public class SimpleSessionBean implements SessionBean {
private EJBContext ejbcontext;
- private transient javax.ejb.SessionContext m_ctx = null;
+ private transient jakarta.ejb.SessionContext m_ctx = null;
transient javax.sql.DataSource ds;
- public void setSessionContext(javax.ejb.SessionContext ctx) {
+ public void setSessionContext(jakarta.ejb.SessionContext ctx) {
m_ctx = ctx;
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/ejb/SimpleSessionHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/ejb/SimpleSessionHome.java
index e2785a6..2f61d85 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/ejb/SimpleSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/ejb/SimpleSessionHome.java
@@ -16,8 +16,8 @@
package com.sun.s1asdev.connector.installed_libraries_test.ejb;
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
public interface SimpleSessionHome extends EJBLocalHome {
SimpleSession create()
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/servlet/SimpleServlet.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/servlet/SimpleServlet.java
index 1f1fe1f..8193c01 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/servlet/SimpleServlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/servlet/SimpleServlet.java
@@ -22,7 +22,7 @@
import javax.servlet.ServletException;
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import javax.ejb.CreateException;
+import jakarta.ejb.CreateException;
import java.io.IOException;
import java.io.PrintWriter;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/ejb/SimpleSession.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/ejb/SimpleSession.java
index c5d2622..17705ef 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/ejb/SimpleSession.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/ejb/SimpleSession.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.connector.installed_libraries_test.ejb;
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
public interface SimpleSession extends EJBLocalObject {
public boolean test1() ;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/ejb/SimpleSessionBean.java
index 44fed4a..ba123ee 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/ejb/SimpleSessionBean.java
@@ -16,8 +16,8 @@
package com.sun.s1asdev.connector.installed_libraries_test.ejb;
-import javax.ejb.EJBContext;
-import javax.ejb.SessionBean;
+import jakarta.ejb.EJBContext;
+import jakarta.ejb.SessionBean;
import javax.naming.InitialContext;
import java.sql.Connection;
import java.sql.ResultSet;
@@ -26,11 +26,11 @@
public class SimpleSessionBean implements SessionBean {
private EJBContext ejbcontext;
- private transient javax.ejb.SessionContext m_ctx = null;
+ private transient jakarta.ejb.SessionContext m_ctx = null;
transient javax.sql.DataSource ds;
- public void setSessionContext(javax.ejb.SessionContext ctx) {
+ public void setSessionContext(jakarta.ejb.SessionContext ctx) {
m_ctx = ctx;
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/ejb/SimpleSessionHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/ejb/SimpleSessionHome.java
index e2785a6..2f61d85 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/ejb/SimpleSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/ejb/SimpleSessionHome.java
@@ -16,8 +16,8 @@
package com.sun.s1asdev.connector.installed_libraries_test.ejb;
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
public interface SimpleSessionHome extends EJBLocalHome {
SimpleSession create()
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/servlet/SimpleServlet.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/servlet/SimpleServlet.java
index 1f1fe1f..8193c01 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/servlet/SimpleServlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/servlet/SimpleServlet.java
@@ -22,7 +22,7 @@
import javax.servlet.ServletException;
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import javax.ejb.CreateException;
+import jakarta.ejb.CreateException;
import java.io.IOException;
import java.io.PrintWriter;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/jms-connection-factory-definition/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/jms-connection-factory-definition/ejb/HelloEJB.java
index cac5c71..d7be43b 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/jms-connection-factory-definition/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/jms-connection-factory-definition/ejb/HelloEJB.java
@@ -21,7 +21,7 @@
import jakarta.annotation.PostConstruct;
import jakarta.annotation.PreDestroy;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import jakarta.jms.Connection;
import jakarta.jms.ConnectionFactory;
import jakarta.jms.JMSConnectionFactoryDefinition;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/jms-connection-factory-definition/ejb/HelloStatefulEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/jms-connection-factory-definition/ejb/HelloStatefulEJB.java
index c474997..1161e8c 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/jms-connection-factory-definition/ejb/HelloStatefulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/jms-connection-factory-definition/ejb/HelloStatefulEJB.java
@@ -21,7 +21,7 @@
import jakarta.annotation.PostConstruct;
import jakarta.annotation.PreDestroy;
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
import jakarta.jms.Connection;
import jakarta.jms.ConnectionFactory;
import jakarta.jms.JMSConnectionFactoryDefinition;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/jms-connection-factory-definition/servlet/Servlet.java b/appserver/tests/appserv-tests/devtests/connector/v3/jms-connection-factory-definition/servlet/Servlet.java
index d254817..0ec1e01 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/jms-connection-factory-definition/servlet/Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/jms-connection-factory-definition/servlet/Servlet.java
@@ -22,8 +22,8 @@
import java.util.Collection;
import jakarta.annotation.Resource;
-import javax.ejb.EJB;
-import javax.ejb.EJBs;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBs;
import jakarta.jms.Connection;
import jakarta.jms.ConnectionFactory;
import jakarta.jms.JMSConnectionFactoryDefinition;
@@ -204,7 +204,7 @@
sleepFor(2);
helloStateful.ping();
//throw new EJBException("Did not get ConcurrentAccessException");
- } catch (javax.ejb.ConcurrentAccessException conEx) {
+ } catch (jakarta.ejb.ConcurrentAccessException conEx) {
; //Everything is fine
} catch (Throwable th) {
throw new Exception("Got some wierd exception: " + th);
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/jms-destination-definition/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/jms-destination-definition/ejb/HelloEJB.java
index 53bc9ef..37347a5 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/jms-destination-definition/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/jms-destination-definition/ejb/HelloEJB.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb.ejb30.hello.session3;
import jakarta.annotation.PostConstruct;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import jakarta.jms.Destination;
import jakarta.jms.JMSDestinationDefinition;
import jakarta.jms.JMSDestinationDefinitions;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/jms-destination-definition/ejb/HelloStatefulEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/jms-destination-definition/ejb/HelloStatefulEJB.java
index be5d6a2..16c611c 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/jms-destination-definition/ejb/HelloStatefulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/jms-destination-definition/ejb/HelloStatefulEJB.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb.ejb30.hello.session3;
import jakarta.annotation.PostConstruct;
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
import jakarta.jms.Destination;
import jakarta.jms.JMSDestinationDefinition;
import jakarta.jms.JMSDestinationDefinitions;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/jms-destination-definition/servlet/Servlet.java b/appserver/tests/appserv-tests/devtests/connector/v3/jms-destination-definition/servlet/Servlet.java
index 0174ed6..eb95435 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/jms-destination-definition/servlet/Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/jms-destination-definition/servlet/Servlet.java
@@ -20,8 +20,8 @@
import java.io.PrintWriter;
import jakarta.annotation.Resource;
-import javax.ejb.EJB;
-import javax.ejb.EJBs;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBs;
import jakarta.jms.Destination;
import jakarta.jms.JMSDestinationDefinition;
import jakarta.jms.JMSDestinationDefinitions;
@@ -183,7 +183,7 @@
sleepFor(2);
helloStateful.ping();
//throw new EJBException("Did not get ConcurrentAccessException");
- } catch (javax.ejb.ConcurrentAccessException conEx) {
+ } catch (jakarta.ejb.ConcurrentAccessException conEx) {
; //Everything is fine
} catch (Throwable th) {
throw new Exception("Got some wierd exception: " + th);
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/client/Client.java b/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/client/Client.java
index 3c03e91..5d6c0ac 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/client/Client.java
@@ -19,7 +19,7 @@
import java.io.*;
import java.util.*;
import java.sql.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import javax.transaction.UserTransaction;
import jakarta.annotation.Resource;
import javax.sql.DataSource;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/Sful.java
index 4c970be..06e0dc5 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/Sful.java
@@ -18,7 +18,7 @@
import java.util.Map;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface Sful {
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/SfulBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/SfulBean.java
index 5531853..c873b9f 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/SfulBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/SfulBean.java
@@ -21,17 +21,17 @@
import javax.naming.InitialContext;
-import javax.ejb.Stateful;
-import javax.ejb.EJB;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.EJB;
import javax.persistence.PersistenceContextType;
import javax.persistence.PersistenceContext;
import javax.persistence.EntityNotFoundException;
import javax.persistence.EntityManager;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.ejb.EJBException;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
+import jakarta.ejb.EJBException;
@Stateful
@EJB(name="ejb/SfulBean",
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/SfulDelegate.java b/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/SfulDelegate.java
index 03e7f74..de756e7 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/SfulDelegate.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/SfulDelegate.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.persistence.tx_propagation;
-import javax.ejb.Local;
+import jakarta.ejb.Local;
import javax.persistence.EntityManager;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/SfulDelegateBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/SfulDelegateBean.java
index f06f15c..714510f 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/SfulDelegateBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/SfulDelegateBean.java
@@ -16,14 +16,14 @@
package com.sun.s1asdev.ejb.ejb30.persistence.tx_propagation;
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
import javax.persistence.PersistenceContextType;
import javax.persistence.PersistenceContext;
import javax.persistence.EntityNotFoundException;
import javax.persistence.EntityManager;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
@Stateful
public class SfulDelegateBean
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/beans/MessageChecker.java b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/beans/MessageChecker.java
index 4e8f7f1..8f68ddf 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/beans/MessageChecker.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/beans/MessageChecker.java
@@ -16,7 +16,7 @@
package beans;
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
public interface MessageChecker extends EJBLocalObject {
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/beans/MessageCheckerEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/beans/MessageCheckerEJB.java
index fa1049f..49ebba4 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/beans/MessageCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/beans/MessageCheckerEJB.java
@@ -17,10 +17,10 @@
package beans;
import connector.MyAdminObject;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
-import javax.ejb.CreateException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.CreateException;
import java.util.Properties;
import java.sql.*;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/beans/MessageCheckerHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/beans/MessageCheckerHome.java
index e9bc945..dd09451 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/beans/MessageCheckerHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/beans/MessageCheckerHome.java
@@ -16,8 +16,8 @@
package beans;
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
public interface MessageCheckerHome extends EJBLocalHome {
MessageChecker create() throws CreateException;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/mdb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/mdb/MyMessageBean.java
index d6950b7..cdf3dcb 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/mdb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/mdb/MyMessageBean.java
@@ -17,7 +17,7 @@
package mdb;
import connector.MyMessageListener;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.servlet.*;
import javax.servlet.http.*;
@@ -43,7 +43,7 @@
/**
* setMessageDrivenContext method, declared as public (but
* not final or static), with a return type of void, and
- * with one argument of type javax.ejb.MessageDrivenContext.
+ * with one argument of type jakarta.ejb.MessageDrivenContext.
*
* @param mdc the context to set
*/
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/beans/MessageChecker.java b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/beans/MessageChecker.java
index 4e8f7f1..8f68ddf 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/beans/MessageChecker.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/beans/MessageChecker.java
@@ -16,7 +16,7 @@
package beans;
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
public interface MessageChecker extends EJBLocalObject {
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/beans/MessageCheckerEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/beans/MessageCheckerEJB.java
index b17c849..c682f0a 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/beans/MessageCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/beans/MessageCheckerEJB.java
@@ -17,10 +17,10 @@
package beans;
import connector.MyAdminObject;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
-import javax.ejb.CreateException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.CreateException;
import java.util.Properties;
import java.sql.*;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/beans/MessageCheckerHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/beans/MessageCheckerHome.java
index e9bc945..dd09451 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/beans/MessageCheckerHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/beans/MessageCheckerHome.java
@@ -16,8 +16,8 @@
package beans;
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
public interface MessageCheckerHome extends EJBLocalHome {
MessageChecker create() throws CreateException;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/mdb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/mdb/MyMessageBean.java
index 03b61c6..1b5c5eb 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/mdb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/mdb/MyMessageBean.java
@@ -17,7 +17,7 @@
package mdb;
import connector.MyMessageListener;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import java.io.*;
import javax.servlet.*;
@@ -44,7 +44,7 @@
/**
* setMessageDrivenContext method, declared as public (but
* not final or static), with a return type of void, and
- * with one argument of type javax.ejb.MessageDrivenContext.
+ * with one argument of type jakarta.ejb.MessageDrivenContext.
*
* @param mdc the context to set
*/
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/Customer.java b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/Customer.java
index 16beae0..08107a5 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/Customer.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/Customer.java
@@ -16,7 +16,7 @@
package samples.ejb.subclassing.ejb;
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
import java.rmi.RemoteException;
public interface Customer extends EJBLocalObject
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerCheckingEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerCheckingEJB.java
index faa5ac3..9093b7e 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerCheckingEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerCheckingEJB.java
@@ -16,7 +16,7 @@
package samples.ejb.subclassing.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.sql.*;
public class CustomerCheckingEJB extends CustomerEJB
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerCheckingHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerCheckingHome.java
index 656fb65..ab153f5 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerCheckingHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerCheckingHome.java
@@ -17,8 +17,8 @@
package samples.ejb.subclassing.ejb;
public interface CustomerCheckingHome extends CustomerHome {
- public CustomerChecking create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws javax.ejb.CreateException;
+ public CustomerChecking create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws jakarta.ejb.CreateException;
- public CustomerChecking findByPrimaryKey(String SSN) throws javax.ejb.FinderException;
+ public CustomerChecking findByPrimaryKey(String SSN) throws jakarta.ejb.FinderException;
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerEJB.java
index a0145ab..0520b60 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerEJB.java
@@ -16,12 +16,12 @@
package samples.ejb.subclassing.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import java.sql.*;
import javax.sql.DataSource;
-public class CustomerEJB implements javax.ejb.EntityBean
+public class CustomerEJB implements jakarta.ejb.EntityBean
{
//database fields
String SSN;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerHome.java
index 0793149..beffdd0 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerHome.java
@@ -16,6 +16,6 @@
package samples.ejb.subclassing.ejb;
-public interface CustomerHome extends javax.ejb.EJBLocalHome {
+public interface CustomerHome extends jakarta.ejb.EJBLocalHome {
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerSavingsEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerSavingsEJB.java
index 199aa62..f30b506 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerSavingsEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerSavingsEJB.java
@@ -16,7 +16,7 @@
package samples.ejb.subclassing.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import java.sql.*;
import javax.sql.DataSource;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerSavingsHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerSavingsHome.java
index fc07ccd..f99f1d0 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerSavingsHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerSavingsHome.java
@@ -19,8 +19,8 @@
import java.rmi.RemoteException;
public interface CustomerSavingsHome extends CustomerHome {
- public CustomerSavings create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws RemoteException,javax.ejb.CreateException;
+ public CustomerSavings create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws RemoteException,jakarta.ejb.CreateException;
- public CustomerSavings findByPrimaryKey(String SSN) throws RemoteException,javax.ejb.FinderException;
+ public CustomerSavings findByPrimaryKey(String SSN) throws RemoteException,jakarta.ejb.FinderException;
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/ejb/SimpleSession.java b/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/ejb/SimpleSession.java
index ac08686..9b8849e 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/ejb/SimpleSession.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/ejb/SimpleSession.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.connector.rar_accessibility_test.ejb;
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
public interface SimpleSession extends EJBLocalObject {
public boolean test1(int expectedCount) ;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/ejb/SimpleSessionBean.java
index ec8512e..6c4056a 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/ejb/SimpleSessionBean.java
@@ -16,8 +16,8 @@
package com.sun.s1asdev.connector.rar_accessibility_test.ejb;
-import javax.ejb.EJBContext;
-import javax.ejb.SessionBean;
+import jakarta.ejb.EJBContext;
+import jakarta.ejb.SessionBean;
import javax.naming.InitialContext;
import java.sql.Connection;
import java.sql.ResultSet;
@@ -26,11 +26,11 @@
public class SimpleSessionBean implements SessionBean {
private EJBContext ejbcontext;
- private transient javax.ejb.SessionContext m_ctx = null;
+ private transient jakarta.ejb.SessionContext m_ctx = null;
transient javax.sql.DataSource ds;
- public void setSessionContext(javax.ejb.SessionContext ctx) {
+ public void setSessionContext(jakarta.ejb.SessionContext ctx) {
m_ctx = ctx;
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/ejb/SimpleSessionHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/ejb/SimpleSessionHome.java
index 7793726..ef006f7 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/ejb/SimpleSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/ejb/SimpleSessionHome.java
@@ -16,8 +16,8 @@
package com.sun.s1asdev.connector.rar_accessibility_test.ejb;
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
public interface SimpleSessionHome extends EJBLocalHome {
SimpleSession create()
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/servlet/SimpleServlet.java b/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/servlet/SimpleServlet.java
index 6f990c9..553cc61 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/servlet/SimpleServlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/servlet/SimpleServlet.java
@@ -22,7 +22,7 @@
import javax.servlet.ServletException;
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import javax.ejb.CreateException;
+import jakarta.ejb.CreateException;
import java.io.IOException;
import java.io.PrintWriter;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/app/src/ejb/VersionChecker.java b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/app/src/ejb/VersionChecker.java
index 88ba87b..ee22914 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/app/src/ejb/VersionChecker.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/app/src/ejb/VersionChecker.java
@@ -16,7 +16,7 @@
package beans;
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
import java.rmi.RemoteException;
public interface VersionChecker extends EJBLocalObject {
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/app/src/ejb/VersionCheckerEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/app/src/ejb/VersionCheckerEJB.java
index 4417224..a00913a 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/app/src/ejb/VersionCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/app/src/ejb/VersionCheckerEJB.java
@@ -16,9 +16,9 @@
package beans;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.CreateException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.CreateException;
import javax.naming.*;
import com.sun.jdbcra.spi.JdbcSetupAdmin;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/app/src/ejb/VersionCheckerHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/app/src/ejb/VersionCheckerHome.java
index 97fc812..d8dfa47 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/app/src/ejb/VersionCheckerHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/app/src/ejb/VersionCheckerHome.java
@@ -16,8 +16,8 @@
package beans;
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
public interface VersionCheckerHome extends EJBLocalHome {
VersionChecker create() throws CreateException;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ejb/VersionChecker.java b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ejb/VersionChecker.java
index ea60190..a8dce7e 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ejb/VersionChecker.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ejb/VersionChecker.java
@@ -16,7 +16,7 @@
package beans;
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
public interface VersionChecker extends EJBLocalObject {
int getVersion() ;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ejb/VersionCheckerEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ejb/VersionCheckerEJB.java
index f947c08..871b6e2 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ejb/VersionCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ejb/VersionCheckerEJB.java
@@ -17,10 +17,10 @@
package beans;
import javax.rmi.PortableRemoteObject;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
-import javax.ejb.CreateException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.CreateException;
import java.util.Properties;
import java.util.Vector;
import java.sql.*;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ejb/VersionCheckerHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ejb/VersionCheckerHome.java
index 08d8c64..b77b16f 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ejb/VersionCheckerHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ejb/VersionCheckerHome.java
@@ -16,8 +16,8 @@
package beans;
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
public interface VersionCheckerHome extends EJBLocalHome {
VersionChecker create() throws CreateException;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/ejb/SimpleSession.java b/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/ejb/SimpleSession.java
index f48f7c9..0455709 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/ejb/SimpleSession.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/ejb/SimpleSession.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.connector.serializabletest.ejb;
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
import java.rmi.RemoteException;
public interface SimpleSession extends EJBLocalObject {
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/ejb/SimpleSessionBean.java
index 633fd36..37f378b 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/ejb/SimpleSessionBean.java
@@ -16,8 +16,8 @@
package com.sun.s1asdev.connector.serializabletest.ejb;
-import javax.ejb.EJBContext;
-import javax.ejb.SessionBean;
+import jakarta.ejb.EJBContext;
+import jakarta.ejb.SessionBean;
import javax.naming.InitialContext;
import java.sql.Connection;
import java.sql.ResultSet;
@@ -26,11 +26,11 @@
public class SimpleSessionBean implements SessionBean {
private EJBContext ejbcontext;
- private transient javax.ejb.SessionContext m_ctx = null;
+ private transient jakarta.ejb.SessionContext m_ctx = null;
transient javax.sql.DataSource ds;
- public void setSessionContext(javax.ejb.SessionContext ctx) {
+ public void setSessionContext(jakarta.ejb.SessionContext ctx) {
m_ctx = ctx;
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/ejb/SimpleSessionHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/ejb/SimpleSessionHome.java
index 6a9f389..0a39173 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/ejb/SimpleSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/ejb/SimpleSessionHome.java
@@ -16,8 +16,8 @@
package com.sun.s1asdev.connector.serializabletest.ejb;
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
public interface SimpleSessionHome extends EJBLocalHome {
SimpleSession create()
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/Customer.java b/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/Customer.java
index 2548584..5922f31 100644
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/Customer.java
+++ b/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/Customer.java
@@ -18,7 +18,7 @@
import java.rmi.RemoteException;
-public interface Customer extends javax.ejb.EJBObject
+public interface Customer extends jakarta.ejb.EJBObject
{
public String getLastName() throws RemoteException;
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerCheckingEJB.java b/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerCheckingEJB.java
index b3b9bc1..ee0d17c 100644
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerCheckingEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerCheckingEJB.java
@@ -16,7 +16,7 @@
package samples.ejb.subclassing.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import java.sql.*;
import javax.sql.DataSource;
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerCheckingHome.java b/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerCheckingHome.java
index 0bb8f41..69f6580 100644
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerCheckingHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerCheckingHome.java
@@ -19,8 +19,8 @@
import java.rmi.RemoteException;
public interface CustomerCheckingHome extends CustomerHome {
- public CustomerChecking create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws RemoteException,javax.ejb.CreateException;
+ public CustomerChecking create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws RemoteException,jakarta.ejb.CreateException;
- public CustomerChecking findByPrimaryKey(String SSN) throws RemoteException,javax.ejb.FinderException;
+ public CustomerChecking findByPrimaryKey(String SSN) throws RemoteException,jakarta.ejb.FinderException;
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerEJB.java b/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerEJB.java
index a0145ab..0520b60 100644
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerEJB.java
@@ -16,12 +16,12 @@
package samples.ejb.subclassing.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import java.sql.*;
import javax.sql.DataSource;
-public class CustomerEJB implements javax.ejb.EntityBean
+public class CustomerEJB implements jakarta.ejb.EntityBean
{
//database fields
String SSN;
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerHome.java b/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerHome.java
index 3d58631..166572e 100644
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerHome.java
@@ -18,6 +18,6 @@
import java.rmi.RemoteException;
-public interface CustomerHome extends javax.ejb.EJBHome {
+public interface CustomerHome extends jakarta.ejb.EJBHome {
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerSavingsEJB.java b/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerSavingsEJB.java
index 199aa62..f30b506 100644
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerSavingsEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerSavingsEJB.java
@@ -16,7 +16,7 @@
package samples.ejb.subclassing.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import java.sql.*;
import javax.sql.DataSource;
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerSavingsHome.java b/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerSavingsHome.java
index fc07ccd..f99f1d0 100644
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerSavingsHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerSavingsHome.java
@@ -19,8 +19,8 @@
import java.rmi.RemoteException;
public interface CustomerSavingsHome extends CustomerHome {
- public CustomerSavings create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws RemoteException,javax.ejb.CreateException;
+ public CustomerSavings create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws RemoteException,jakarta.ejb.CreateException;
- public CustomerSavings findByPrimaryKey(String SSN) throws RemoteException,javax.ejb.FinderException;
+ public CustomerSavings findByPrimaryKey(String SSN) throws RemoteException,jakarta.ejb.FinderException;
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/servlet/SimpleBankServlet.java b/appserver/tests/appserv-tests/devtests/connector/web2connector/servlet/SimpleBankServlet.java
index a904c68..7a48ac1 100644
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/servlet/SimpleBankServlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/web2connector/servlet/SimpleBankServlet.java
@@ -22,7 +22,7 @@
import javax.naming.*;
import javax.servlet.http.*;
import javax.rmi.PortableRemoteObject;
-import javax.ejb.*;
+import jakarta.ejb.*;
import samples.ejb.subclassing.ejb.*;
import com.sun.jdbcra.spi.JdbcSetupAdmin;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/appclient/src/Client.java b/appserver/tests/appserv-tests/devtests/deployment/annotation/appclient/src/Client.java
index c144ee0..08498d1 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/annotation/appclient/src/Client.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/annotation/appclient/src/Client.java
@@ -16,7 +16,7 @@
package test;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import test.ejb.stateful.SFHello;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/goldenfiles/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/goldenfiles/ejb-jar.xml
index 19cffb5..b349c3c 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/goldenfiles/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/goldenfiles/ejb-jar.xml
@@ -91,7 +91,7 @@
</resource-ref>
<resource-env-ref>
<resource-env-ref-name>test.ejb.stateless.InterceptorB/sessionCtx</resource-env-ref-name>
- <resource-env-ref-type>javax.ejb.SessionContext</resource-env-ref-type>
+ <resource-env-ref-type>jakarta.ejb.SessionContext</resource-env-ref-type>
<injection-target>
<injection-target-class>test.ejb.stateless.InterceptorB</injection-target-class>
<injection-target-name>sessionCtx</injection-target-name>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/InterceptorA.java b/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/InterceptorA.java
index 83a187a..85740a0 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/InterceptorA.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/InterceptorA.java
@@ -18,7 +18,7 @@
import jakarta.annotation.PostConstruct;
import jakarta.annotation.Resource;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import javax.interceptor.AroundInvoke;
import javax.interceptor.InvocationContext;
import javax.sql.DataSource;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/InterceptorB.java b/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/InterceptorB.java
index 5d146d9..57b7426 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/InterceptorB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/InterceptorB.java
@@ -18,7 +18,7 @@
import jakarta.annotation.PreDestroy;
import jakarta.annotation.Resource;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionContext;
import javax.interceptor.AroundInvoke;
import javax.interceptor.InvocationContext;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/StatefulTest1.java b/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/StatefulTest1.java
index be270fb..dcca8b2 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/StatefulTest1.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/StatefulTest1.java
@@ -16,11 +16,11 @@
package test.ejb.stateful;
-import javax.ejb.EJB;
-import javax.ejb.Remote;
-import javax.ejb.Stateful;
-import javax.ejb.TransactionManagement;
-import javax.ejb.TransactionManagementType;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Remote;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.TransactionManagement;
+import jakarta.ejb.TransactionManagementType;
import test.ejb.stateless.*;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/StatefulTest2.java b/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/StatefulTest2.java
index 66659f8..c870de7 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/StatefulTest2.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/StatefulTest2.java
@@ -14,9 +14,9 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/
-import javax.ejb.Stateful;
-import javax.ejb.Remote;
-import javax.ejb.TransactionManagementType;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.Remote;
+import jakarta.ejb.TransactionManagementType;
import test.ejb.stateful.SFHello;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/StatelessTest1.java b/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/StatelessTest1.java
index 0f7bd1b..d9c0c7a 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/StatelessTest1.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/StatelessTest1.java
@@ -19,11 +19,11 @@
import jakarta.annotation.security.PermitAll;
import jakarta.annotation.security.RolesAllowed;
import jakarta.annotation.security.RunAs;
-import javax.ejb.Local;
-import javax.ejb.Stateless;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.ejb.TransactionManagementType;
+import jakarta.ejb.Local;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
+import jakarta.ejb.TransactionManagementType;
import javax.interceptor.Interceptors;
/**
diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/StatelessTest2.java b/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/StatelessTest2.java
index 691efe3..79165d6 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/StatelessTest2.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/StatelessTest2.java
@@ -19,10 +19,10 @@
import jakarta.annotation.security.DenyAll;
import jakarta.annotation.security.PermitAll;
import jakarta.annotation.security.RolesAllowed;
-import javax.ejb.Local;
-import javax.ejb.Stateless;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.Local;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
/**
* @author Shing Wai Chan
diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/goldenfiles/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/goldenfiles/ejb-jar.xml
index 7e6864a..482ed70 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/goldenfiles/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/goldenfiles/ejb-jar.xml
@@ -47,7 +47,7 @@
<resource-env-ref>
<description>testing</description>
<resource-env-ref-name>test.ejb.StatefulTest/ejbContext</resource-env-ref-name>
- <resource-env-ref-type>javax.ejb.EJBContext</resource-env-ref-type>
+ <resource-env-ref-type>jakarta.ejb.EJBContext</resource-env-ref-type>
<injection-target>
<injection-target-class>test.ejb.StatefulTest</injection-target-class>
<injection-target-name>ejbContext</injection-target-name>
@@ -55,7 +55,7 @@
</resource-env-ref>
<resource-env-ref>
<resource-env-ref-name>sfContext</resource-env-ref-name>
- <resource-env-ref-type>javax.ejb.EJBContext</resource-env-ref-type>
+ <resource-env-ref-type>jakarta.ejb.EJBContext</resource-env-ref-type>
<injection-target>
<injection-target-class>StatefulTest2</injection-target-class>
<injection-target-name>ejbContext</injection-target-name>
@@ -63,7 +63,7 @@
</resource-env-ref>
<resource-env-ref>
<resource-env-ref-name>test.ejb.StatefulTest/ejbContext2</resource-env-ref-name>
- <resource-env-ref-type>javax.ejb.EJBContext</resource-env-ref-type>
+ <resource-env-ref-type>jakarta.ejb.EJBContext</resource-env-ref-type>
<injection-target>
<injection-target-class>test.ejb.StatefulTest</injection-target-class>
<injection-target-name>ejbContext2</injection-target-name>
@@ -71,7 +71,7 @@
</resource-env-ref>
<resource-env-ref>
<resource-env-ref-name>sfContext2</resource-env-ref-name>
- <resource-env-ref-type>javax.ejb.EJBContext</resource-env-ref-type>
+ <resource-env-ref-type>jakarta.ejb.EJBContext</resource-env-ref-type>
<injection-target>
<injection-target-class>StatefulTest2</injection-target-class>
<injection-target-name>ejbContext2</injection-target-name>
@@ -79,7 +79,7 @@
</resource-env-ref>
<resource-env-ref>
<resource-env-ref-name>test.ejb.StatefulTest/ejbContext3</resource-env-ref-name>
- <resource-env-ref-type>javax.ejb.EJBContext</resource-env-ref-type>
+ <resource-env-ref-type>jakarta.ejb.EJBContext</resource-env-ref-type>
<injection-target>
<injection-target-class>test.ejb.StatefulTest</injection-target-class>
<injection-target-name>ejbContext3</injection-target-name>
@@ -137,7 +137,7 @@
<resource-env-ref>
<description>testing</description>
<resource-env-ref-name>test.ejb.StatefulTest/ejbContext</resource-env-ref-name>
- <resource-env-ref-type>javax.ejb.EJBContext</resource-env-ref-type>
+ <resource-env-ref-type>jakarta.ejb.EJBContext</resource-env-ref-type>
<injection-target>
<injection-target-class>test.ejb.StatefulTest</injection-target-class>
<injection-target-name>ejbContext</injection-target-name>
@@ -145,7 +145,7 @@
</resource-env-ref>
<resource-env-ref>
<resource-env-ref-name>sfEjbContext</resource-env-ref-name>
- <resource-env-ref-type>javax.ejb.EJBContext</resource-env-ref-type>
+ <resource-env-ref-type>jakarta.ejb.EJBContext</resource-env-ref-type>
<injection-target>
<injection-target-class>test.ejb.StatefulTest1</injection-target-class>
<injection-target-name>ejbContext</injection-target-name>
@@ -153,7 +153,7 @@
</resource-env-ref>
<resource-env-ref>
<resource-env-ref-name>sfEjbContext2</resource-env-ref-name>
- <resource-env-ref-type>javax.ejb.EJBContext</resource-env-ref-type>
+ <resource-env-ref-type>jakarta.ejb.EJBContext</resource-env-ref-type>
<injection-target>
<injection-target-class>test.ejb.StatefulTest1</injection-target-class>
<injection-target-name>ejbContext2</injection-target-name>
@@ -161,7 +161,7 @@
</resource-env-ref>
<resource-env-ref>
<resource-env-ref-name>sfEjbContext3</resource-env-ref-name>
- <resource-env-ref-type>javax.ejb.EJBContext</resource-env-ref-type>
+ <resource-env-ref-type>jakarta.ejb.EJBContext</resource-env-ref-type>
<injection-target>
<injection-target-class>test.ejb.StatefulTest1</injection-target-class>
<injection-target-name>ejbContext3</injection-target-name>
@@ -200,7 +200,7 @@
<resource-env-ref>
<description>testing</description>
<resource-env-ref-name>test.ejb.StatefulTest/ejbContext</resource-env-ref-name>
- <resource-env-ref-type>javax.ejb.EJBContext</resource-env-ref-type>
+ <resource-env-ref-type>jakarta.ejb.EJBContext</resource-env-ref-type>
<injection-target>
<injection-target-class>test.ejb.StatefulTest</injection-target-class>
<injection-target-name>ejbContext</injection-target-name>
@@ -208,7 +208,7 @@
</resource-env-ref>
<resource-env-ref>
<resource-env-ref-name>test.ejb.StatefulTest/ejbContext2</resource-env-ref-name>
- <resource-env-ref-type>javax.ejb.EJBContext</resource-env-ref-type>
+ <resource-env-ref-type>jakarta.ejb.EJBContext</resource-env-ref-type>
<injection-target>
<injection-target-class>test.ejb.StatefulTest</injection-target-class>
<injection-target-name>ejbContext2</injection-target-name>
@@ -216,7 +216,7 @@
</resource-env-ref>
<resource-env-ref>
<resource-env-ref-name>test.ejb.StatefulTest/ejbContext3</resource-env-ref-name>
- <resource-env-ref-type>javax.ejb.EJBContext</resource-env-ref-type>
+ <resource-env-ref-type>jakarta.ejb.EJBContext</resource-env-ref-type>
<injection-target>
<injection-target-class>test.ejb.StatefulTest</injection-target-class>
<injection-target-name>ejbContext3</injection-target-name>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/src/StatefulTest.java b/appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/src/StatefulTest.java
index dd91dc4..78c03f5 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/src/StatefulTest.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/src/StatefulTest.java
@@ -19,13 +19,13 @@
import jakarta.annotation.Resource;
import jakarta.annotation.security.PermitAll;
import jakarta.annotation.security.RunAs;
-import javax.ejb.EJB;
-import javax.ejb.EJBContext;
-import javax.ejb.Local;
-import javax.ejb.Local;
-import javax.ejb.Stateful;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBContext;
+import jakarta.ejb.Local;
+import jakarta.ejb.Local;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
import javax.sql.DataSource;
/**
diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/src/StatefulTest1.java b/appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/src/StatefulTest1.java
index a055054..8a30968 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/src/StatefulTest1.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/src/StatefulTest1.java
@@ -17,12 +17,12 @@
package test.ejb;
import jakarta.annotation.Resource;
-import javax.ejb.EJB;
-import javax.ejb.EJBContext;
-import javax.ejb.Remote;
-import javax.ejb.Stateful;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBContext;
+import jakarta.ejb.Remote;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
import javax.sql.DataSource;
/**
diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/src/StatefulTest2.java b/appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/src/StatefulTest2.java
index 3ca00a3..0f804bd 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/src/StatefulTest2.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/src/StatefulTest2.java
@@ -17,11 +17,11 @@
import jakarta.annotation.Resource;
import jakarta.annotation.security.RolesAllowed;
import jakarta.annotation.security.RunAs;
-import javax.ejb.EJBContext;
-import javax.ejb.Remote;
-import javax.ejb.Stateful;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.EJBContext;
+import jakarta.ejb.Remote;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
import test.ejb.SFHello1;
import test.ejb.StatefulTest;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/web/src/ServletTest.java b/appserver/tests/appserv-tests/devtests/deployment/annotation/web/src/ServletTest.java
index f7f64ce..d96c3b6 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/annotation/web/src/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/annotation/web/src/ServletTest.java
@@ -21,7 +21,7 @@
import jakarta.annotation.PostConstruct;
import jakarta.annotation.PreDestroy;
import jakarta.annotation.security.DeclareRoles;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/dir_deploy/client/Client.java b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/dir_deploy/client/Client.java
index 4f9032f..5293865 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/dir_deploy/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/dir_deploy/client/Client.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.deployment.noappxml.client;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import com.sun.s1asdev.deployment.noappxml.ejb.Sful;
import com.sun.s1asdev.deployment.noappxml.ejb.Sless;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/dir_deploy/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/dir_deploy/ejb/SfulEJB.java
index e3d6998..36a9bff 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/dir_deploy/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/dir_deploy/ejb/SfulEJB.java
@@ -17,8 +17,8 @@
package com.sun.s1asdev.deployment.noappxml.ejb;
import com.sun.s1asdev.deployment.noappxml.util.Util;
-import javax.ejb.Stateful;
-import javax.ejb.Remote;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.Remote;
@Stateful
@Remote({Sful.class})
diff --git a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/dir_deploy/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/dir_deploy/ejb/SlessEJB.java
index 542b812..fbec4fb 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/dir_deploy/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/dir_deploy/ejb/SlessEJB.java
@@ -17,8 +17,8 @@
package com.sun.s1asdev.deployment.noappxml.ejb;
import com.sun.s1asdev.deployment.noappxml.util.Util;
-import javax.ejb.Stateless;
-import javax.ejb.Remote;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.Remote;
@Stateless
@Remote({Sless.class})
diff --git a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/client/Client.java b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/client/Client.java
index 4f9032f..5293865 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/client/Client.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.deployment.noappxml.client;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import com.sun.s1asdev.deployment.noappxml.ejb.Sful;
import com.sun.s1asdev.deployment.noappxml.ejb.Sless;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/ejb/SfulEJB.java
index e3d6998..36a9bff 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/ejb/SfulEJB.java
@@ -17,8 +17,8 @@
package com.sun.s1asdev.deployment.noappxml.ejb;
import com.sun.s1asdev.deployment.noappxml.util.Util;
-import javax.ejb.Stateful;
-import javax.ejb.Remote;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.Remote;
@Stateful
@Remote({Sful.class})
diff --git a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/ejb/SlessEJB.java
index 542b812..fbec4fb 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/ejb/SlessEJB.java
@@ -17,8 +17,8 @@
package com.sun.s1asdev.deployment.noappxml.ejb;
import com.sun.s1asdev.deployment.noappxml.util.Util;
-import javax.ejb.Stateless;
-import javax.ejb.Remote;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.Remote;
@Stateless
@Remote({Sless.class})
diff --git a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/client/Client.java b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/client/Client.java
index 0014b9a..1f875ea 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/client/Client.java
@@ -18,7 +18,7 @@
import java.net.*;
import java.io.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import com.sun.s1asdev.deployment.noappxml.ejb.Sful;
import com.sun.s1asdev.deployment.noappxml.ejb.Sless;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/ejb/SfulEJB.java
index e3d6998..36a9bff 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/ejb/SfulEJB.java
@@ -17,8 +17,8 @@
package com.sun.s1asdev.deployment.noappxml.ejb;
import com.sun.s1asdev.deployment.noappxml.util.Util;
-import javax.ejb.Stateful;
-import javax.ejb.Remote;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.Remote;
@Stateful
@Remote({Sful.class})
diff --git a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/ejb/SlessEJB.java
index 542b812..fbec4fb 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/ejb/SlessEJB.java
@@ -17,8 +17,8 @@
package com.sun.s1asdev.deployment.noappxml.ejb;
import com.sun.s1asdev.deployment.noappxml.util.Util;
-import javax.ejb.Stateless;
-import javax.ejb.Remote;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.Remote;
@Stateless
@Remote({Sless.class})
diff --git a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/client/HelloClient.java b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/client/HelloClient.java
index 1e2ede8..982e81f 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/client/HelloClient.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/client/HelloClient.java
@@ -17,7 +17,7 @@
package standaloneclient;
import java.util.*;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
import statelesshello.*;
import javax.naming.*;
import javax.rmi.PortableRemoteObject;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ear/ejb/Greeter.java b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ear/ejb/Greeter.java
index a0ec5f5..9047e64 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ear/ejb/Greeter.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ear/ejb/Greeter.java
@@ -26,7 +26,7 @@
* to obtain references to the bean's remote interface (Greeter, in this case).
*
*/
-public interface Greeter extends javax.ejb.EJBObject {
+public interface Greeter extends jakarta.ejb.EJBObject {
/**
* Returns a greeting.
* @return returns a greeting as a string.
diff --git a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ear/ejb/GreeterEJB.java b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ear/ejb/GreeterEJB.java
index 3dbe2ad..b6bb56d 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ear/ejb/GreeterEJB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ear/ejb/GreeterEJB.java
@@ -23,15 +23,15 @@
* A simple stateless bean for the HelloWorld application. This bean implements one
* business method as declared by the remote interface.
*/
-public class GreeterEJB implements javax.ejb.SessionBean {
+public class GreeterEJB implements jakarta.ejb.SessionBean {
- private javax.ejb.SessionContext m_ctx = null;
+ private jakarta.ejb.SessionContext m_ctx = null;
/**
* Sets the session context. Required by EJB spec.
* @param ctx A SessionContext object.
*/
- public void setSessionContext(javax.ejb.SessionContext ctx) {
+ public void setSessionContext(jakarta.ejb.SessionContext ctx) {
m_ctx = ctx;
}
@@ -39,7 +39,7 @@
* Creates a bean. Required by EJB spec.
* @exception throws CreateException.
*/
- public void ejbCreate() throws javax.ejb.EJBException, javax.ejb.CreateException {
+ public void ejbCreate() throws jakarta.ejb.EJBException, jakarta.ejb.CreateException {
System.out.println("ejbCreate() on obj " + this);
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ear/ejb/GreeterHome.java b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ear/ejb/GreeterHome.java
index 2707fba..12d023a 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ear/ejb/GreeterHome.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ear/ejb/GreeterHome.java
@@ -21,11 +21,11 @@
* to obtain references to the bean's remote interface.
*
*/
-public interface GreeterHome extends javax.ejb.EJBHome {
+public interface GreeterHome extends jakarta.ejb.EJBHome {
/**
* Gets a reference to the remote interface to the Greeter bean.
* @exception throws CreateException and RemoteException.
*
*/
- public Greeter create() throws java.rmi.RemoteException, javax.ejb.CreateException;
+ public Greeter create() throws java.rmi.RemoteException, jakarta.ejb.CreateException;
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ear/war/GreeterServlet.java b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ear/war/GreeterServlet.java
index 6dff849..936ec3a 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ear/war/GreeterServlet.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ear/war/GreeterServlet.java
@@ -22,7 +22,7 @@
import javax.naming.*;
import javax.servlet.http.*;
import javax.rmi.PortableRemoteObject;
-import javax.ejb.*;
+import jakarta.ejb.*;
import samples.ejb.stateless.simple.ejb.*;
@@ -39,7 +39,7 @@
public void doGet (HttpServletRequest request,HttpServletResponse response)
throws ServletException, IOException {
- javax.ejb.Handle beanHandle;
+ jakarta.ejb.Handle beanHandle;
Greeter myGreeterBean;
GreeterHome myGreeterHome;
Greeter myGreeterRemote;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ejb/ejb/Statelesshello.java b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ejb/ejb/Statelesshello.java
index df4724f..ca7d5d5 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ejb/ejb/Statelesshello.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ejb/ejb/Statelesshello.java
@@ -16,7 +16,7 @@
package statelesshello;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.Remote;
import java.rmi.RemoteException;
import java.io.Serializable;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ejb/ejb/StatelesshelloEJB.java b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ejb/ejb/StatelesshelloEJB.java
index f1361c3..f4b611d 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ejb/ejb/StatelesshelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ejb/ejb/StatelesshelloEJB.java
@@ -19,9 +19,9 @@
import java.io.Serializable;
import java.io.InputStream;
import java.rmi.RemoteException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
import javax.naming.*;
public class StatelesshelloEJB implements SessionBean {
diff --git a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ejb/ejb/StatelesshelloHome.java b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ejb/ejb/StatelesshelloHome.java
index 7a80be8..1513c0b 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ejb/ejb/StatelesshelloHome.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ejb/ejb/StatelesshelloHome.java
@@ -20,8 +20,8 @@
import java.io.Serializable;
import java.rmi.Remote;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface StatelesshelloHome extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/deployment/dol/validation/ear/ejb/META-INF/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/deployment/dol/validation/ear/ejb/META-INF/ejb-jar.xml
index f164ad2..82de8c3 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/dol/validation/ear/ejb/META-INF/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/dol/validation/ear/ejb/META-INF/ejb-jar.xml
@@ -593,7 +593,7 @@
<method-intf>Home</method-intf>
<method-name>remove</method-name>
<method-params>
- <method-param>javax.ejb.Handle</method-param>
+ <method-param>jakarta.ejb.Handle</method-param>
</method-params>
</method>
<trans-attribute>RequiresNew</trans-attribute>
@@ -670,7 +670,7 @@
<method-intf>Home</method-intf>
<method-name>remove</method-name>
<method-params>
- <method-param>javax.ejb.Handle</method-param>
+ <method-param>jakarta.ejb.Handle</method-param>
</method-params>
</method>
</exclude-list>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/dol/validation/ejb/META-INF/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/deployment/dol/validation/ejb/META-INF/ejb-jar.xml
index 42e76b5..7fc4880 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/dol/validation/ejb/META-INF/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/dol/validation/ejb/META-INF/ejb-jar.xml
@@ -498,7 +498,7 @@
<method-intf>Home</method-intf>
<method-name>remove</method-name>
<method-params>
- <method-param>javax.ejb.Handle</method-param>
+ <method-param>jakarta.ejb.Handle</method-param>
</method-params>
</method>
<trans-attribute>RequiresNew</trans-attribute>
@@ -559,7 +559,7 @@
<method-intf>Home</method-intf>
<method-name>remove</method-name>
<method-params>
- <method-param>javax.ejb.Handle</method-param>
+ <method-param>jakarta.ejb.Handle</method-param>
</method-params>
</method>
</exclude-list>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/helloservice/SayHelloImpl.java b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/helloservice/SayHelloImpl.java
index a53bb47..ed449a6 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/helloservice/SayHelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/helloservice/SayHelloImpl.java
@@ -19,7 +19,7 @@
import javax.rmi.*;
import java.rmi.*;
import javax.naming.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import statelesshello.*;
public class SayHelloImpl implements SayHello {
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/statelesshello/Statelesshello.java b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/statelesshello/Statelesshello.java
index 6415970..1b08767 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/statelesshello/Statelesshello.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/statelesshello/Statelesshello.java
@@ -16,7 +16,7 @@
package statelesshello;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.Remote;
import java.rmi.RemoteException;
import java.io.Serializable;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/statelesshello/StatelesshelloEJB.java b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/statelesshello/StatelesshelloEJB.java
index 6284103..4933850 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/statelesshello/StatelesshelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/statelesshello/StatelesshelloEJB.java
@@ -18,9 +18,9 @@
import java.io.Serializable;
import java.rmi.RemoteException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
import javax.naming.*;
public class StatelesshelloEJB implements SessionBean {
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/statelesshello/StatelesshelloHome.java b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/statelesshello/StatelesshelloHome.java
index 7a80be8..1513c0b 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/statelesshello/StatelesshelloHome.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/statelesshello/StatelesshelloHome.java
@@ -20,8 +20,8 @@
import java.io.Serializable;
import java.rmi.Remote;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface StatelesshelloHome extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/ejb-jar.xml
index 5347046..fb0f874 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/ejb-jar.xml
@@ -53,7 +53,7 @@
<method-intf>Remote</method-intf>
<method-name>isIdentical</method-name>
<method-params>
-<method-param>javax.ejb.EJBObject</method-param>
+<method-param>jakarta.ejb.EJBObject</method-param>
</method-params>
</method>
<method>
@@ -66,7 +66,7 @@
<method-intf>Home</method-intf>
<method-name>remove</method-name>
<method-params>
-<method-param>javax.ejb.Handle</method-param>
+<method-param>jakarta.ejb.Handle</method-param>
</method-params>
</method>
<method>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justbean/JustBean.java b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justbean/JustBean.java
index 92d5bd6..0981dcb 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justbean/JustBean.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justbean/JustBean.java
@@ -17,7 +17,7 @@
package justbean;
import java.rmi.RemoteException;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
public interface JustBean extends EJBObject {
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justbean/JustBeanHome.java b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justbean/JustBeanHome.java
index 4abfa89..539fb70 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justbean/JustBeanHome.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justbean/JustBeanHome.java
@@ -17,8 +17,8 @@
package justbean;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface JustBeanHome extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justbean/JustSessionBean.java b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justbean/JustSessionBean.java
index 37f5fe9..42b3df8 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justbean/JustSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justbean/JustSessionBean.java
@@ -17,8 +17,8 @@
package justbean;
import java.rmi.RemoteException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
public class JustSessionBean implements SessionBean {
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/client/LibDirTestClient.java b/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/client/LibDirTestClient.java
index df3b8fe..a5cb29f 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/client/LibDirTestClient.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/client/LibDirTestClient.java
@@ -17,7 +17,7 @@
package libclasspath2.client;
import java.io.IOException;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import libclasspath2.ResourceHelper;
import libclasspath2.ejb.LookupSBRemote;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/ejb/LookupSBBean.java b/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/ejb/LookupSBBean.java
index d20b89d..87afb58 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/ejb/LookupSBBean.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/ejb/LookupSBBean.java
@@ -21,7 +21,7 @@
import java.net.URL;
import java.net.URLConnection;
import java.util.Properties;
-import javax.ejb.*;
+import jakarta.ejb.*;
import libclasspath2.ResourceHelper;
/**
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/ejb/LookupSBRemote.java b/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/ejb/LookupSBRemote.java
index ed9fcfa..2f77f2b 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/ejb/LookupSBRemote.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/ejb/LookupSBRemote.java
@@ -17,7 +17,7 @@
package libclasspath2.ejb;
import java.io.IOException;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
import libclasspath2.ResourceHelper;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/wstoejb/StatefulSessionBean.java b/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/wstoejb/StatefulSessionBean.java
index 89907d6..75e9120 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/wstoejb/StatefulSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/wstoejb/StatefulSessionBean.java
@@ -16,7 +16,7 @@
package wstoejb;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
import java.rmi.RemoteException;
/**
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/wstoejb/StatefulSessionBeanEJB.java b/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/wstoejb/StatefulSessionBeanEJB.java
index 79a4b3f..eb720f0 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/wstoejb/StatefulSessionBeanEJB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/wstoejb/StatefulSessionBeanEJB.java
@@ -16,7 +16,7 @@
package wstoejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
/**
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/wstoejb/StatefulSessionBeanHome.java b/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/wstoejb/StatefulSessionBeanHome.java
index 99c4bdc..f0761c5 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/wstoejb/StatefulSessionBeanHome.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/wstoejb/StatefulSessionBeanHome.java
@@ -17,8 +17,8 @@
package wstoejb;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
/**
* Simple interface to create a statefull session bean
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/standaloneclient/HelloClient.java b/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/standaloneclient/HelloClient.java
index 1e2ede8..982e81f 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/standaloneclient/HelloClient.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/standaloneclient/HelloClient.java
@@ -17,7 +17,7 @@
package standaloneclient;
import java.util.*;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
import statelesshello.*;
import javax.naming.*;
import javax.rmi.PortableRemoteObject;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/statelesshello/Statelesshello.java b/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/statelesshello/Statelesshello.java
index df4724f..ca7d5d5 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/statelesshello/Statelesshello.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/statelesshello/Statelesshello.java
@@ -16,7 +16,7 @@
package statelesshello;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.Remote;
import java.rmi.RemoteException;
import java.io.Serializable;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/statelesshello/StatelesshelloEJB.java b/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/statelesshello/StatelesshelloEJB.java
index f1361c3..f4b611d 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/statelesshello/StatelesshelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/statelesshello/StatelesshelloEJB.java
@@ -19,9 +19,9 @@
import java.io.Serializable;
import java.io.InputStream;
import java.rmi.RemoteException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
import javax.naming.*;
public class StatelesshelloEJB implements SessionBean {
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/statelesshello/StatelesshelloHome.java b/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/statelesshello/StatelesshelloHome.java
index 7a80be8..1513c0b 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/statelesshello/StatelesshelloHome.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/statelesshello/StatelesshelloHome.java
@@ -20,8 +20,8 @@
import java.io.Serializable;
import java.rmi.Remote;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface StatelesshelloHome extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/helloservice/SayHelloEJB.java b/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/helloservice/SayHelloEJB.java
index 3e83eb2..46e08dc 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/helloservice/SayHelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/helloservice/SayHelloEJB.java
@@ -16,7 +16,7 @@
package helloservice;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
public class SayHelloEJB implements SessionBean {
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/mdb/webclient/ejb/HelloStateful.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/mdb/webclient/ejb/HelloStateful.java
index a8064fa..62b18c5 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/mdb/webclient/ejb/HelloStateful.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/mdb/webclient/ejb/HelloStateful.java
@@ -16,8 +16,8 @@
package com.sun.s1asdev.ejb.ejb30.hello.mdb;
-import javax.ejb.Stateful;
-import javax.ejb.Remove;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.Remove;
import jakarta.annotation.PreDestroy;
// Hello1 interface is not annotated with @Local. If the
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/mdb/webclient/ejb/HelloStateless.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/mdb/webclient/ejb/HelloStateless.java
index cd9ff58..0fe0118 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/mdb/webclient/ejb/HelloStateless.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/mdb/webclient/ejb/HelloStateless.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.hello.mdb;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
// Hello1 interface is not annotated with @Local. If the
// bean only implements one interface it is assumed to be
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/mdb/webclient/ejb/MessageBean.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/mdb/webclient/ejb/MessageBean.java
index 3ab7631..c7189ff 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/mdb/webclient/ejb/MessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/mdb/webclient/ejb/MessageBean.java
@@ -16,12 +16,12 @@
package com.sun.s1asdev.ejb.ejb30.hello.mdb;
-import javax.ejb.MessageDriven;
-import javax.ejb.EJBException;
-import javax.ejb.EJB;
-import javax.ejb.TransactionManagement;
-import javax.ejb.TransactionManagementType;
-import javax.ejb.ActivationConfigProperty;
+import jakarta.ejb.MessageDriven;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.TransactionManagement;
+import jakarta.ejb.TransactionManagementType;
+import jakarta.ejb.ActivationConfigProperty;
import jakarta.jms.MessageListener;
import jakarta.jms.Message;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/client/Client.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/client/Client.java
index a5aa811..20b9149 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/client/Client.java
@@ -19,8 +19,8 @@
import java.io.*;
import java.net.*;
import java.util.*;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
import com.sun.s1asdev.deployment.ejb30.ear.security.*;
public class Client {
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/ejb/Sful.java
index 16f0c9c..f33d2d2 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/ejb/Sful.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.deployment.ejb30.ear.security;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface Sful
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/ejb/SfulEJB.java
index cd0a6ab..a86666f 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/ejb/SfulEJB.java
@@ -21,10 +21,10 @@
import jakarta.annotation.security.DenyAll;
import jakarta.annotation.security.RolesAllowed;
import jakarta.annotation.security.RunAs;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
-import javax.ejb.SessionContext;
-import javax.ejb.Stateful;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.Stateful;
@RunAs(value="sunuser")
@DeclareRoles({"j2ee", "sunuser"})
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/ejb/SlessEJB.java
index bfad418..af6efd2 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/ejb/SlessEJB.java
@@ -18,10 +18,10 @@
import jakarta.annotation.Resource;
import jakarta.annotation.security.RolesAllowed;
-import javax.ejb.SessionContext;
-import javax.ejb.Local;
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.Local;
+import jakarta.ejb.Remote;
+import jakarta.ejb.Stateless;
@Stateless
@Remote({Sless.class})
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/web/Servlet.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/web/Servlet.java
index e42f592..76ba5fc 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/web/Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/web/Servlet.java
@@ -20,7 +20,7 @@
import java.io.PrintWriter;
import jakarta.annotation.security.RunAs;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/client/Client.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/client/Client.java
index a04944f..f0a0087 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/client/Client.java
@@ -19,7 +19,7 @@
import java.io.*;
import java.util.*;
import jakarta.annotation.PostConstruct;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import com.sun.s1asdev.ejb.ejb30.hello.session.*;
public class Client {
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/ejb/Sful.java
index 896d72f..80af5ba 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/ejb/Sful.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.hello.session;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface Sful
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/ejb/SfulEJB.java
index acb4650..d3599e3 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/ejb/SfulEJB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.hello.session;
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
@Stateful
public class SfulEJB implements Sful
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/ejb/Sless.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/ejb/Sless.java
index 8ed905b..e997278 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/ejb/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/ejb/Sless.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.hello.session;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface Sless
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/ejb/SlessEJB.java
index 1e986fc..df1e71c 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/ejb/SlessEJB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.hello.session;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
@Stateless
public class SlessEJB implements Sless
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/client/Client.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/client/Client.java
index 7503393..888af7c 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/client/Client.java
@@ -18,11 +18,11 @@
import java.io.*;
import java.util.*;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
-import javax.ejb.EJBs;
-import javax.ejb.NoSuchEJBException;
-import javax.ejb.EJBTransactionRequiredException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.EJBs;
+import jakarta.ejb.NoSuchEJBException;
+import jakarta.ejb.EJBTransactionRequiredException;
import javax.naming.InitialContext;
import javax.naming.Context;
import com.sun.s1asdev.ejb.ejb30.hello.session2.*;
@@ -219,7 +219,7 @@
try {
sless1.hello2();
throw new Exception("Did not receive CreateException");
- } catch(javax.ejb.CreateException ce) {
+ } catch(jakarta.ejb.CreateException ce) {
System.out.println("Successfully caught app exception");
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/client/ClientSuper.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/client/ClientSuper.java
index d728a3b..adaaf7f 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/client/ClientSuper.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/client/ClientSuper.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.hello.session2.client;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import com.sun.s1asdev.ejb.ejb30.hello.session2.*;
public class ClientSuper {
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/Foo.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/Foo.java
index 68bba90..d89469d 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/Foo.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/Foo.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.hello.session2;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.Remote;
import java.rmi.RemoteException;
import java.io.Serializable;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/FooHome.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/FooHome.java
index e90831c..587c29d 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/FooHome.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/FooHome.java
@@ -19,8 +19,8 @@
import java.io.Serializable;
import java.rmi.Remote;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface FooHome extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/Sful2.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/Sful2.java
index 35e7471..a42c24c 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/Sful2.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/Sful2.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.hello.session2;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface Sful2
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SfulEJB.java
index 9f6a436..da9d18c 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SfulEJB.java
@@ -16,18 +16,18 @@
package com.sun.s1asdev.ejb.ejb30.hello.session2;
-import javax.ejb.Stateful;
-import javax.ejb.Remote;
-import javax.ejb.EJB;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.Remote;
+import jakarta.ejb.EJB;
import jakarta.annotation.PostConstruct;
import javax.interceptor.Interceptors;
-import javax.ejb.EJBs;
-import javax.ejb.Remove;
+import jakarta.ejb.EJBs;
+import jakarta.ejb.Remove;
import jakarta.annotation.PreDestroy;
-import javax.ejb.EJBException;
-import javax.ejb.SessionContext;
-import javax.ejb.TransactionManagement;
-import javax.ejb.TransactionManagementType;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.TransactionManagement;
+import jakarta.ejb.TransactionManagementType;
import javax.naming.InitialContext;
import jakarta.annotation.Resource;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SfulEJB2.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SfulEJB2.java
index d368bb9..0b431e0 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SfulEJB2.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SfulEJB2.java
@@ -16,19 +16,19 @@
package com.sun.s1asdev.ejb.ejb30.hello.session2;
-import javax.ejb.Stateful;
-import javax.ejb.Remote;
-import javax.ejb.EJB;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.Remote;
+import jakarta.ejb.EJB;
import jakarta.annotation.PostConstruct;
import javax.interceptor.Interceptors;
-import javax.ejb.EJBs;
-import javax.ejb.Remove;
-import javax.ejb.SessionSynchronization;
+import jakarta.ejb.EJBs;
+import jakarta.ejb.Remove;
+import jakarta.ejb.SessionSynchronization;
import jakarta.annotation.PreDestroy;
-import javax.ejb.EJBException;
-import javax.ejb.SessionContext;
-import javax.ejb.TransactionManagement;
-import javax.ejb.TransactionManagementType;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.TransactionManagement;
+import jakarta.ejb.TransactionManagementType;
import javax.naming.InitialContext;
import jakarta.annotation.Resource;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/Sless.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/Sless.java
index 5997572..325c0cc 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/Sless.java
@@ -22,7 +22,7 @@
{
public String hello();
- public String hello2() throws javax.ejb.CreateException;
+ public String hello2() throws jakarta.ejb.CreateException;
public String getId();
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SlessEJB.java
index 03d1b07..a9b4afb 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SlessEJB.java
@@ -16,10 +16,10 @@
package com.sun.s1asdev.ejb.ejb30.hello.session2;
-import javax.ejb.Stateless;
-import javax.ejb.Remote;
-import javax.ejb.EJB;
-import javax.ejb.CreateException;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.Remote;
+import jakarta.ejb.EJB;
+import jakarta.ejb.CreateException;
import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
@@ -37,8 +37,8 @@
return "hello from SlessEJB";
}
- public String hello2() throws javax.ejb.CreateException {
- throw new javax.ejb.CreateException();
+ public String hello2() throws jakarta.ejb.CreateException {
+ throw new jakarta.ejb.CreateException();
}
public String getId() {
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SlessEJB2.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SlessEJB2.java
index 8b01cd2..4a85608 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SlessEJB2.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SlessEJB2.java
@@ -16,15 +16,15 @@
package com.sun.s1asdev.ejb.ejb30.hello.session2;
-import javax.ejb.Stateless;
-import javax.ejb.Remote;
-import javax.ejb.EJBException;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.Remote;
+import jakarta.ejb.EJBException;
import jakarta.annotation.PostConstruct;
-import javax.ejb.SessionBean;
-import javax.ejb.CreateException;
-import javax.ejb.SessionContext;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
import javax.naming.InitialContext;
import javax.transaction.TransactionManager;
@@ -64,8 +64,8 @@
return "hello from SlessEJB2";
}
- public String hello2() throws javax.ejb.CreateException {
- throw new javax.ejb.CreateException();
+ public String hello2() throws jakarta.ejb.CreateException {
+ throw new jakarta.ejb.CreateException();
}
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SlessEJB3.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SlessEJB3.java
index 098a718..09811f3 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SlessEJB3.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SlessEJB3.java
@@ -16,12 +16,12 @@
package com.sun.s1asdev.ejb.ejb30.hello.session2;
-import javax.ejb.Stateless;
-import javax.ejb.Remote;
-import javax.ejb.EJB;
-import javax.ejb.EJBContext;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.Remote;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBContext;
import jakarta.annotation.PostConstruct;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionContext;
import jakarta.annotation.Resource;
import java.util.Collection;
@@ -39,7 +39,7 @@
private @Resource SessionContext ejbContext2;
- @Resource(type=javax.ejb.SessionContext.class)
+ @Resource(type=jakarta.ejb.SessionContext.class)
private EJBContext ejbContext3;
private EJBContext ejbContext4;
@@ -74,7 +74,7 @@
}
private EJBContext ejbContext6;
- @Resource(type=javax.ejb.SessionContext.class)
+ @Resource(type=jakarta.ejb.SessionContext.class)
private void setEJBContext6(EJBContext context) {
ejbContext6 = context;
}
@@ -101,8 +101,8 @@
return "hello from sless ejb3";
}
- public String hello2() throws javax.ejb.CreateException {
- throw new javax.ejb.CreateException();
+ public String hello2() throws jakarta.ejb.CreateException {
+ throw new jakarta.ejb.CreateException();
}
public String hello3() {
@@ -119,7 +119,7 @@
if( get1.equals(get2) ) {
System.out.println("get1 =" + get1);
System.out.println("get2 =" + get2);
- throw new javax.ejb.EJBException("SFSB get test failed");
+ throw new jakarta.ejb.EJBException("SFSB get test failed");
}
return "hello3()";
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/ejb/HelloEJB.java
index b1386d2..2ac549f 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/ejb/HelloEJB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.hello.session3;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import javax.persistence.EntityManagerFactory;
import javax.persistence.PersistenceUnit;
@@ -62,13 +62,13 @@
ic.lookup("java:comp/env/myem");
} catch(Exception e) {
- throw new javax.ejb.EJBException(e);
+ throw new jakarta.ejb.EJBException(e);
}
System.out.println("HelloEJB successful injection of EMF/EM references!");
} else {
- throw new javax.ejb.EJBException("One or more EMF/EM references" +
+ throw new jakarta.ejb.EJBException("One or more EMF/EM references" +
" was not injected in HelloEJB");
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/ejb/HelloStatefulEJB.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/ejb/HelloStatefulEJB.java
index 1fe5f69..4441bb8 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/ejb/HelloStatefulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/ejb/HelloStatefulEJB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.hello.session3;
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
import jakarta.annotation.PostConstruct;
@Stateful public class HelloStatefulEJB implements HelloStateful {
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/servlet/Servlet.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/servlet/Servlet.java
index a49640a..046eb0b 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/servlet/Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/servlet/Servlet.java
@@ -22,9 +22,9 @@
import javax.servlet.http.*;
import javax.naming.*;
import javax.rmi.PortableRemoteObject;
-import javax.ejb.EJB;
-import javax.ejb.EJBs;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBs;
+import jakarta.ejb.EJBException;
import jakarta.annotation.Resource;
import jakarta.annotation.Resources;
import javax.sql.DataSource;
@@ -200,7 +200,7 @@
sleepFor(10);
helloStateful2.ping();
throw new EJBException("Did not get ConcurrentAccessException");
- } catch (javax.ejb.ConcurrentAccessException conEx) {
+ } catch (jakarta.ejb.ConcurrentAccessException conEx) {
; //Everything is fine
} catch (Throwable th) {
throw new EJBException("Got some wierd exception: " + th);
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/xmloverride/client/Client.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/xmloverride/client/Client.java
index 2ec0fcd..b43e380 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/xmloverride/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/xmloverride/client/Client.java
@@ -19,8 +19,8 @@
import java.io.*;
import java.net.*;
import java.util.*;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
import com.sun.s1asdev.deployment.ejb30.ear.xmloverride.*;
public class Client {
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/xmloverride/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/xmloverride/ejb/Sful.java
index f029b2a..7f96125 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/xmloverride/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/xmloverride/ejb/Sful.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.deployment.ejb30.ear.xmloverride;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface Sful
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/xmloverride/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/xmloverride/ejb/SfulEJB.java
index 44cb84c..0da941e 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/xmloverride/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/xmloverride/ejb/SfulEJB.java
@@ -21,12 +21,12 @@
import jakarta.annotation.security.PermitAll;
import jakarta.annotation.security.RolesAllowed;
import jakarta.annotation.security.RunAs;
-import javax.ejb.EJB;
-import javax.ejb.SessionContext;
-import javax.ejb.SessionSynchronization;
-import javax.ejb.Stateful;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.EJB;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.SessionSynchronization;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
import javax.naming.InitialContext;
import javax.sql.DataSource;
import javax.transaction.TransactionManager;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/xmloverride/ejb/Sless.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/xmloverride/ejb/Sless.java
index 68fafed..1291490 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/xmloverride/ejb/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/xmloverride/ejb/Sless.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.deployment.ejb30.ear.xmloverride;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface Sless
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/xmloverride/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/xmloverride/ejb/SlessEJB.java
index 279deaa..9d625ab 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/xmloverride/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/xmloverride/ejb/SlessEJB.java
@@ -18,8 +18,8 @@
import jakarta.annotation.Resource;
import jakarta.annotation.security.RolesAllowed;
-import javax.ejb.SessionContext;
-import javax.ejb.Stateless;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.Stateless;
@Stateless
public class SlessEJB implements Sless
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/war/jsp/web/DummyEJB.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/war/jsp/web/DummyEJB.java
index 6c9ddc8..c46c3e2 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/war/jsp/web/DummyEJB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/war/jsp/web/DummyEJB.java
@@ -16,8 +16,8 @@
package com.sun.s1asdev.deployment.ejb30.web.jsp;
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
+import jakarta.ejb.Remote;
+import jakarta.ejb.Stateless;
@Stateless
@Remote({Dummy.class})
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/BarManagedBean.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/BarManagedBean.java
index 7d7cf27..d1df3f6 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/BarManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/BarManagedBean.java
@@ -17,7 +17,7 @@
package com.acme;
import jakarta.annotation.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import jakarta.annotation.Resource;
import javax.sql.DataSource;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/FooManagedBean.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/FooManagedBean.java
index 2e7f864..460a386 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/FooManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/FooManagedBean.java
@@ -18,7 +18,7 @@
import jakarta.annotation.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import jakarta.annotation.Resource;
import org.omg.CORBA.ORB;
import javax.persistence.PersistenceContext;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/HelloServlet.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/HelloServlet.java
index 3e19563..b19027c 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/HelloServlet.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/HelloServlet.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import java.io.IOException;
import java.io.PrintWriter;
import java.sql.Connection;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/InterceptorA.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/InterceptorA.java
index 2fa8120..9308e5f 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/InterceptorA.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/InterceptorA.java
@@ -18,7 +18,7 @@
import jakarta.annotation.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import jakarta.annotation.Resource;
import org.omg.CORBA.ORB;
import javax.persistence.PersistenceContext;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/InterceptorB.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/InterceptorB.java
index fd2c630..b72ac76 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/InterceptorB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/InterceptorB.java
@@ -22,7 +22,7 @@
import javax.interceptor.AroundInvoke;
import java.util.Map;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJBException;
public class InterceptorB extends InterceptorSuper {
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/ManagedSuper.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/ManagedSuper.java
index 77a2d3d..a4a80da 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/ManagedSuper.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/ManagedSuper.java
@@ -17,7 +17,7 @@
package com.acme;
import jakarta.annotation.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import jakarta.annotation.Resource;
import javax.sql.DataSource;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/SingletonBean.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/SingletonBean.java
index 63d118e..394ffce 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/SingletonBean.java
@@ -23,13 +23,13 @@
import jakarta.annotation.PreDestroy;
import jakarta.annotation.Resource;
-import javax.ejb.Singleton;
-import javax.ejb.Startup;
-import javax.ejb.EJBException;
-import javax.ejb.EJB;
-import javax.ejb.LocalBean;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.LocalBean;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionContext;
@Singleton
@LocalBean
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/StatefulBean.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/StatefulBean.java
index 6cb2e78..e5a3a6a 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/StatefulBean.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/StatefulBean.java
@@ -16,8 +16,8 @@
package com.acme;
-import javax.ejb.Stateful;
-import javax.ejb.*;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.*;
import javax.interceptor.Interceptors;
import jakarta.annotation.PostConstruct;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/StatelessBean.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/StatelessBean.java
index 4f94e2f..c52310f 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/StatelessBean.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/StatelessBean.java
@@ -16,8 +16,8 @@
package com.acme;
-import javax.ejb.Stateless;
-import javax.ejb.*;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.*;
import javax.interceptor.Interceptors;
import jakarta.annotation.PostConstruct;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/AppScopedResources/CorrectEnterpriseApplication/ejbModule/gf/Invoker.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/AppScopedResources/CorrectEnterpriseApplication/ejbModule/gf/Invoker.java
index 513eb5e..2fd69ce 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/AppScopedResources/CorrectEnterpriseApplication/ejbModule/gf/Invoker.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/AppScopedResources/CorrectEnterpriseApplication/ejbModule/gf/Invoker.java
@@ -16,7 +16,7 @@
package gf;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
@Stateless
public class Invoker {}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEJBRef/ejbModule/gf/Invoker1.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEJBRef/ejbModule/gf/Invoker1.java
index 7ff9a57..bcac37b 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEJBRef/ejbModule/gf/Invoker1.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEJBRef/ejbModule/gf/Invoker1.java
@@ -16,8 +16,8 @@
package gf;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEJBRef/ejbModule/gf/Invoker2.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEJBRef/ejbModule/gf/Invoker2.java
index 2a11ffd..c7f5e33 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEJBRef/ejbModule/gf/Invoker2.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEJBRef/ejbModule/gf/Invoker2.java
@@ -16,8 +16,8 @@
package gf;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEJBRef/ejbModule/gf/MySLSB.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEJBRef/ejbModule/gf/MySLSB.java
index 56ebe6c..c8aec0d 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEJBRef/ejbModule/gf/MySLSB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEJBRef/ejbModule/gf/MySLSB.java
@@ -16,7 +16,7 @@
package gf;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEJBRef/ejbModule/gf/MySLSB2.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEJBRef/ejbModule/gf/MySLSB2.java
index d6ed501..4c96f15 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEJBRef/ejbModule/gf/MySLSB2.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEJBRef/ejbModule/gf/MySLSB2.java
@@ -16,7 +16,7 @@
package gf;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEnvEntry/ejbModule/gf/Invoker1.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEnvEntry/ejbModule/gf/Invoker1.java
index 883e242..cdd64fe 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEnvEntry/ejbModule/gf/Invoker1.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEnvEntry/ejbModule/gf/Invoker1.java
@@ -16,7 +16,7 @@
package gf;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEnvEntry/ejbModule/gf/Invoker2.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEnvEntry/ejbModule/gf/Invoker2.java
index 3b38654..1c2dab7 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEnvEntry/ejbModule/gf/Invoker2.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEnvEntry/ejbModule/gf/Invoker2.java
@@ -16,7 +16,7 @@
package gf;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflitedResourceEnvRef/ejbModule/gf/Invoker1.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflitedResourceEnvRef/ejbModule/gf/Invoker1.java
index 883e242..cdd64fe 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflitedResourceEnvRef/ejbModule/gf/Invoker1.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflitedResourceEnvRef/ejbModule/gf/Invoker1.java
@@ -16,7 +16,7 @@
package gf;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflitedResourceEnvRef/ejbModule/gf/Invoker2.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflitedResourceEnvRef/ejbModule/gf/Invoker2.java
index 3b38654..1c2dab7 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflitedResourceEnvRef/ejbModule/gf/Invoker2.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflitedResourceEnvRef/ejbModule/gf/Invoker2.java
@@ -16,7 +16,7 @@
package gf;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflitedResourceRef/ejbModule/gf/Invoker3.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflitedResourceRef/ejbModule/gf/Invoker3.java
index 1b6a8b8..40f8a1f 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflitedResourceRef/ejbModule/gf/Invoker3.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflitedResourceRef/ejbModule/gf/Invoker3.java
@@ -17,7 +17,7 @@
package gf;
import jakarta.annotation.Resource;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflitedResourceRef/ejbModule/gf/Invoker4.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflitedResourceRef/ejbModule/gf/Invoker4.java
index 55339fd..f64f516 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflitedResourceRef/ejbModule/gf/Invoker4.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflitedResourceRef/ejbModule/gf/Invoker4.java
@@ -17,7 +17,7 @@
package gf;
import jakarta.annotation.Resource;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/CorrectEnvEntry/src/gf/Invoker1.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/CorrectEnvEntry/src/gf/Invoker1.java
index 883e242..cdd64fe 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/CorrectEnvEntry/src/gf/Invoker1.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/CorrectEnvEntry/src/gf/Invoker1.java
@@ -16,7 +16,7 @@
package gf;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/EJBRef/CorrectLocalRef/ejbModule/src/Sless.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/EJBRef/CorrectLocalRef/ejbModule/src/Sless.java
index 55a8ac7..f816484 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/EJBRef/CorrectLocalRef/ejbModule/src/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/EJBRef/CorrectLocalRef/ejbModule/src/Sless.java
@@ -16,7 +16,7 @@
package test.ejb;
-import javax.ejb.Local;
+import jakarta.ejb.Local;
@Local
public interface Sless {
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/EJBRef/CorrectLocalRef/ejbModule/src/SlessEJB.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/EJBRef/CorrectLocalRef/ejbModule/src/SlessEJB.java
index a156e2a..2e10d95 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/EJBRef/CorrectLocalRef/ejbModule/src/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/EJBRef/CorrectLocalRef/ejbModule/src/SlessEJB.java
@@ -17,7 +17,7 @@
package test.ejb;
import jakarta.annotation.Resource;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
@Stateless
public class SlessEJB implements Sless {
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/EJBRef/CorrectLocalRef/webModule/src/TestServlet.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/EJBRef/CorrectLocalRef/webModule/src/TestServlet.java
index 2482a5e..03aa11f 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/EJBRef/CorrectLocalRef/webModule/src/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/EJBRef/CorrectLocalRef/webModule/src/TestServlet.java
@@ -18,7 +18,7 @@
import java.io.IOException;
import jakarta.annotation.Resource;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/EJBRef/RemoteRef/ejbModule/src/SlessEJB.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/EJBRef/RemoteRef/ejbModule/src/SlessEJB.java
index d2b59ee..4468ee2 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/EJBRef/RemoteRef/ejbModule/src/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/EJBRef/RemoteRef/ejbModule/src/SlessEJB.java
@@ -17,8 +17,8 @@
package test.ejb;
import jakarta.annotation.Resource;
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
+import jakarta.ejb.Remote;
+import jakarta.ejb.Stateless;
@Stateless(mappedName="sless_ejb")
@Remote(Sless.class)
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/EJBRef/RemoteRef/webModule/src/TestServlet.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/EJBRef/RemoteRef/webModule/src/TestServlet.java
index ad150ee..3eb2853 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/EJBRef/RemoteRef/webModule/src/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/EJBRef/RemoteRef/webModule/src/TestServlet.java
@@ -18,7 +18,7 @@
import java.io.IOException;
import jakarta.annotation.Resource;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/IncorrectEnvEntry/src/gf/Invoker1.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/IncorrectEnvEntry/src/gf/Invoker1.java
index 883e242..cdd64fe 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/IncorrectEnvEntry/src/gf/Invoker1.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/IncorrectEnvEntry/src/gf/Invoker1.java
@@ -16,7 +16,7 @@
package gf;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ResourceRef/CorrectEnvProps/ejbModule/gf/Invoker.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ResourceRef/CorrectEnvProps/ejbModule/gf/Invoker.java
index 4e171ce..62b6a03 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ResourceRef/CorrectEnvProps/ejbModule/gf/Invoker.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ResourceRef/CorrectEnvProps/ejbModule/gf/Invoker.java
@@ -17,7 +17,7 @@
package gf;
import jakarta.annotation.Resource;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
@Stateless
public class Invoker {
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ResourceRef/CorrectQueueRes/src/gf/Invoker.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ResourceRef/CorrectQueueRes/src/gf/Invoker.java
index 08f0c78..5c0693f 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ResourceRef/CorrectQueueRes/src/gf/Invoker.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ResourceRef/CorrectQueueRes/src/gf/Invoker.java
@@ -16,7 +16,7 @@
package gf;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import jakarta.annotation.Resource;
import jakarta.jms.QueueConnectionFactory;
import jakarta.jms.Queue;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ResourceRef/DefaultResources/src/gf/TestServlet.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ResourceRef/DefaultResources/src/gf/TestServlet.java
index 77cb2af..4d8587e 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ResourceRef/DefaultResources/src/gf/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ResourceRef/DefaultResources/src/gf/TestServlet.java
@@ -17,10 +17,10 @@
package gf;
import jakarta.annotation.Resource;
-import javax.ejb.EJBContext;
-import javax.ejb.SessionContext;
-import javax.ejb.MessageDrivenContext;
-import javax.ejb.TimerService;
+import jakarta.ejb.EJBContext;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.MessageDrivenContext;
+import jakarta.ejb.TimerService;
import javax.enterprise.concurrent.ContextService;
import javax.enterprise.concurrent.ManagedExecutorService;
import javax.enterprise.concurrent.ManagedScheduledExecutorService;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/versioning/simple-versioned-ejb/src/SimpleVersionedEjb.java b/appserver/tests/appserv-tests/devtests/deployment/versioning/simple-versioned-ejb/src/SimpleVersionedEjb.java
index de2ab72..524de7f 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/versioning/simple-versioned-ejb/src/SimpleVersionedEjb.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/versioning/simple-versioned-ejb/src/SimpleVersionedEjb.java
@@ -16,7 +16,7 @@
package versionedejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface SimpleVersionedEjb {
diff --git a/appserver/tests/appserv-tests/devtests/deployment/versioning/simple-versioned-ejb/src/SimpleVersionedEjbImpl.java b/appserver/tests/appserv-tests/devtests/deployment/versioning/simple-versioned-ejb/src/SimpleVersionedEjbImpl.java
index ed794a2..0024e71 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/versioning/simple-versioned-ejb/src/SimpleVersionedEjbImpl.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/versioning/simple-versioned-ejb/src/SimpleVersionedEjbImpl.java
@@ -21,7 +21,7 @@
import java.util.Properties;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
@Stateful(name="SimpleVersionedEjb", mappedName="ejb/SimpleVersionedEjb")
public class SimpleVersionedEjbImpl implements SimpleVersionedEjb {
diff --git a/appserver/tests/appserv-tests/devtests/deployment/webservices/noinf/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/deployment/webservices/noinf/endpoint/HelloImpl.java
index a71374b..abd758b 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/webservices/noinf/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/webservices/noinf/endpoint/HelloImpl.java
@@ -17,7 +17,7 @@
package endpoint;
import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
@WebService
@Stateless
diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/client/Client.java
index 9d029b7..8928c70 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/client/Client.java
@@ -18,7 +18,7 @@
import java.io.*;
import java.util.*;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
import javax.naming.*;
import javax.rmi.PortableRemoteObject;
import org.omg.CORBA.ORB;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/Driver.java b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/Driver.java
index fa653d0..7001018 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/Driver.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/Driver.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.allowedmethods.ctxcheck;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.Remote;
import java.rmi.RemoteException;
import java.io.Serializable;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/DriverBean.java b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/DriverBean.java
index 825a54c..252abd5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/DriverBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/DriverBean.java
@@ -19,9 +19,9 @@
import java.util.Enumeration;
import java.io.Serializable;
import java.rmi.RemoteException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
import javax.naming.*;
import javax.rmi.PortableRemoteObject;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/DriverHome.java b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/DriverHome.java
index afbb3ea..1440393 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/DriverHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/DriverHome.java
@@ -19,8 +19,8 @@
import java.io.Serializable;
import java.rmi.Remote;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface DriverHome extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/HereLocal.java b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/HereLocal.java
index b1f8c84..9252323 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/HereLocal.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/HereLocal.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.allowedmethods.ctxcheck;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface HereLocal
extends EJBLocalObject
diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/HereLocalBean.java b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/HereLocalBean.java
index 210adc8..4696c14 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/HereLocalBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/HereLocalBean.java
@@ -19,9 +19,9 @@
import java.util.Enumeration;
import java.io.Serializable;
import java.rmi.RemoteException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
import javax.naming.*;
import javax.rmi.PortableRemoteObject;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/HereLocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/HereLocalHome.java
index 004894e..abc592e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/HereLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/HereLocalHome.java
@@ -16,8 +16,8 @@
package com.sun.s1asdev.ejb.allowedmethods.ctxcheck;
-import javax.ejb.EJBLocalHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
public interface HereLocalHome
diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalEntity.java b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalEntity.java
index d849683..f0526f0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalEntity.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalEntity.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb.allowedmethods.ctxcheck;
import java.util.ArrayList;
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
import java.rmi.RemoteException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalEntityBean.java b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalEntityBean.java
index b1ad197..b01c9a6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalEntityBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalEntityBean.java
@@ -19,7 +19,7 @@
import java.sql.*;
import javax.sql.*;
import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.rmi.PortableRemoteObject;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalEntityHome.java b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalEntityHome.java
index 0373cd9..c73a23a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalEntityHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalEntityHome.java
@@ -16,10 +16,10 @@
package com.sun.s1asdev.ejb.allowedmethods.ctxcheck;
-import javax.ejb.EJBLocalHome;
+import jakarta.ejb.EJBLocalHome;
import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.FinderException;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.FinderException;
public interface LocalEntityHome
extends EJBLocalHome
diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalStudent.java b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalStudent.java
index 0a88bb4..ea3e28e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalStudent.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalStudent.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb.allowedmethods.ctxcheck;
import java.util.ArrayList;
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
import java.rmi.RemoteException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/ThereRemote.java b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/ThereRemote.java
index b656d23..8beed1f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/ThereRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/ThereRemote.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.allowedmethods.ctxcheck;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
public interface ThereRemote
diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/ThereRemoteBean.java b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/ThereRemoteBean.java
index 1b5905d..85752f6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/ThereRemoteBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/ThereRemoteBean.java
@@ -19,9 +19,9 @@
import java.util.Enumeration;
import java.io.Serializable;
import java.rmi.RemoteException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
import javax.naming.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/ThereRemoteHome.java b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/ThereRemoteHome.java
index a1fa0a9..d669134 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/ThereRemoteHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/ThereRemoteHome.java
@@ -16,8 +16,8 @@
package com.sun.s1asdev.ejb.allowedmethods.ctxcheck;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
import java.rmi.RemoteException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/client/Client.java
index 73c1104..688f0b2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/client/Client.java
@@ -18,7 +18,7 @@
import java.io.*;
import java.util.*;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
import javax.naming.*;
import javax.rmi.PortableRemoteObject;
import org.omg.CORBA.ORB;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/Driver.java b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/Driver.java
index 5f93ecd..05061fb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/Driver.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/Driver.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.allowedmethods.remove;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.Remote;
import java.rmi.RemoteException;
import java.io.Serializable;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/DriverBean.java b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/DriverBean.java
index cf5af89..774accc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/DriverBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/DriverBean.java
@@ -19,10 +19,10 @@
import java.util.Enumeration;
import java.io.Serializable;
import java.rmi.RemoteException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
-import javax.ejb.RemoveException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.RemoveException;
import javax.naming.*;
import javax.rmi.PortableRemoteObject;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/DriverHome.java b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/DriverHome.java
index 6ffad93..7f423fe 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/DriverHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/DriverHome.java
@@ -19,8 +19,8 @@
import java.io.Serializable;
import java.rmi.Remote;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface DriverHome extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/HereLocal.java b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/HereLocal.java
index 10cfc82..970e1c8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/HereLocal.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/HereLocal.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.allowedmethods.remove;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface HereLocal
extends EJBLocalObject
diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/HereLocalBean.java b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/HereLocalBean.java
index f4ec737..fd7c176 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/HereLocalBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/HereLocalBean.java
@@ -19,9 +19,9 @@
import java.util.Enumeration;
import java.io.Serializable;
import java.rmi.RemoteException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
import javax.naming.*;
import javax.rmi.PortableRemoteObject;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/HereLocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/HereLocalHome.java
index 3816e4c..69891bf 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/HereLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/HereLocalHome.java
@@ -16,8 +16,8 @@
package com.sun.s1asdev.ejb.allowedmethods.remove;
-import javax.ejb.EJBLocalHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
public interface HereLocalHome
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/descriptor/ejb-jar.xml
index b8bc21a..825f577 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/descriptor/ejb-jar.xml
@@ -146,7 +146,7 @@
<method-intf>Home</method-intf>
<method-name>remove</method-name>
<method-params>
- <method-param>javax.ejb.Handle</method-param>
+ <method-param>jakarta.ejb.Handle</method-param>
</method-params>
</method>
<method>
@@ -201,7 +201,7 @@
<method-intf>Remote</method-intf>
<method-name>isIdentical</method-name>
<method-params>
- <method-param>javax.ejb.EJBObject</method-param>
+ <method-param>jakarta.ejb.EJBObject</method-param>
</method-params>
</method>
<method>
@@ -232,7 +232,7 @@
<method-intf>Home</method-intf>
<method-name>remove</method-name>
<method-params>
- <method-param>javax.ejb.Handle</method-param>
+ <method-param>jakarta.ejb.Handle</method-param>
</method-params>
</method>
<method>
@@ -295,7 +295,7 @@
<method-intf>Remote</method-intf>
<method-name>isIdentical</method-name>
<method-params>
- <method-param>javax.ejb.EJBObject</method-param>
+ <method-param>jakarta.ejb.EJBObject</method-param>
</method-params>
</method>
<method>
@@ -365,7 +365,7 @@
<method-intf>Home</method-intf>
<method-name>remove</method-name>
<method-params>
- <method-param>javax.ejb.Handle</method-param>
+ <method-param>jakarta.ejb.Handle</method-param>
</method-params>
</method>
<method>
@@ -414,7 +414,7 @@
<method-intf>Remote</method-intf>
<method-name>isIdentical</method-name>
<method-params>
- <method-param>javax.ejb.EJBObject</method-param>
+ <method-param>jakarta.ejb.EJBObject</method-param>
</method-params>
</method>
<method>
@@ -470,7 +470,7 @@
<method-intf>Home</method-intf>
<method-name>remove</method-name>
<method-params>
- <method-param>javax.ejb.Handle</method-param>
+ <method-param>jakarta.ejb.Handle</method-param>
</method-params>
</method>
<trans-attribute>NotSupported</trans-attribute>
@@ -625,7 +625,7 @@
<method-intf>Home</method-intf>
<method-name>remove</method-name>
<method-params>
- <method-param>javax.ejb.Handle</method-param>
+ <method-param>jakarta.ejb.Handle</method-param>
</method-params>
</method>
<trans-attribute>NotSupported</trans-attribute>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/Course.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/Course.java
index f055ae4..3c3b739 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/Course.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/Course.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb.bmp.finder.ejb;
import java.util.ArrayList;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
import java.rmi.RemoteException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/CourseBean.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/CourseBean.java
index e41dc1d..daf34c6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/CourseBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/CourseBean.java
@@ -19,7 +19,7 @@
import java.sql.*;
import javax.sql.*;
import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.rmi.PortableRemoteObject;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/CourseHome.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/CourseHome.java
index d6aad22..1e5b712 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/CourseHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/CourseHome.java
@@ -16,10 +16,10 @@
package com.sun.s1asdev.ejb.bmp.finder.ejb;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
import java.rmi.RemoteException;
-import javax.ejb.FinderException;
-import javax.ejb.CreateException;
+import jakarta.ejb.FinderException;
+import jakarta.ejb.CreateException;
public interface CourseHome extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/Enroller.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/Enroller.java
index 02fd3d2..26bd031 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/Enroller.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/Enroller.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb.bmp.finder.ejb;
import java.util.ArrayList;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
import java.rmi.RemoteException;
public interface Enroller extends EJBObject {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/EnrollerBean.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/EnrollerBean.java
index 7cc5084..44292d7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/EnrollerBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/EnrollerBean.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb.bmp.finder.ejb;
import java.rmi.RemoteException;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.sql.*;
import javax.sql.*;
import java.util.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/EnrollerHome.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/EnrollerHome.java
index 07505f3..348f16a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/EnrollerHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/EnrollerHome.java
@@ -17,8 +17,8 @@
package com.sun.s1asdev.ejb.bmp.finder.ejb;
import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBHome;
public interface EnrollerHome extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/Student.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/Student.java
index 9a62121..c0b4153 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/Student.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/Student.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb.bmp.finder.ejb;
import java.util.ArrayList;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
import java.rmi.RemoteException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/StudentBean.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/StudentBean.java
index 3d6535d..3310d76 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/StudentBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/StudentBean.java
@@ -19,7 +19,7 @@
import java.sql.*;
import javax.sql.*;
import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.rmi.PortableRemoteObject;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/StudentHome.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/StudentHome.java
index a7dcd69..4925aa9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/StudentHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/StudentHome.java
@@ -16,10 +16,10 @@
package com.sun.s1asdev.ejb.bmp.finder.ejb;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.FinderException;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.FinderException;
public interface StudentHome extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/descriptor/ejb-jar.xml
index f9273a1..d9222cd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/descriptor/ejb-jar.xml
@@ -141,7 +141,7 @@
<method-intf>Home</method-intf>
<method-name>remove</method-name>
<method-params>
- <method-param>javax.ejb.Handle</method-param>
+ <method-param>jakarta.ejb.Handle</method-param>
</method-params>
</method>
<method>
@@ -196,7 +196,7 @@
<method-intf>Remote</method-intf>
<method-name>isIdentical</method-name>
<method-params>
- <method-param>javax.ejb.EJBObject</method-param>
+ <method-param>jakarta.ejb.EJBObject</method-param>
</method-params>
</method>
<method>
@@ -227,7 +227,7 @@
<method-intf>Home</method-intf>
<method-name>remove</method-name>
<method-params>
- <method-param>javax.ejb.Handle</method-param>
+ <method-param>jakarta.ejb.Handle</method-param>
</method-params>
</method>
<method>
@@ -290,7 +290,7 @@
<method-intf>Remote</method-intf>
<method-name>isIdentical</method-name>
<method-params>
- <method-param>javax.ejb.EJBObject</method-param>
+ <method-param>jakarta.ejb.EJBObject</method-param>
</method-params>
</method>
<method>
@@ -360,7 +360,7 @@
<method-intf>Home</method-intf>
<method-name>remove</method-name>
<method-params>
- <method-param>javax.ejb.Handle</method-param>
+ <method-param>jakarta.ejb.Handle</method-param>
</method-params>
</method>
<method>
@@ -409,7 +409,7 @@
<method-intf>Remote</method-intf>
<method-name>isIdentical</method-name>
<method-params>
- <method-param>javax.ejb.EJBObject</method-param>
+ <method-param>jakarta.ejb.EJBObject</method-param>
</method-params>
</method>
<method>
@@ -465,7 +465,7 @@
<method-intf>Home</method-intf>
<method-name>remove</method-name>
<method-params>
- <method-param>javax.ejb.Handle</method-param>
+ <method-param>jakarta.ejb.Handle</method-param>
</method-params>
</method>
<trans-attribute>NotSupported</trans-attribute>
@@ -620,7 +620,7 @@
<method-intf>Home</method-intf>
<method-name>remove</method-name>
<method-params>
- <method-param>javax.ejb.Handle</method-param>
+ <method-param>jakarta.ejb.Handle</method-param>
</method-params>
</method>
<trans-attribute>NotSupported</trans-attribute>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/Course.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/Course.java
index fab2b77..1907a65 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/Course.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/Course.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb.bmp.handle.mix.ejb;
import java.util.ArrayList;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
import java.rmi.RemoteException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/CourseBean.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/CourseBean.java
index 1e6b23f..1687d68 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/CourseBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/CourseBean.java
@@ -19,7 +19,7 @@
import java.sql.*;
import javax.sql.*;
import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.rmi.PortableRemoteObject;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/CourseHome.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/CourseHome.java
index 687327a..d01c797 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/CourseHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/CourseHome.java
@@ -16,10 +16,10 @@
package com.sun.s1asdev.ejb.bmp.handle.mix.ejb;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
import java.rmi.RemoteException;
-import javax.ejb.FinderException;
-import javax.ejb.CreateException;
+import jakarta.ejb.FinderException;
+import jakarta.ejb.CreateException;
public interface CourseHome extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/Enroller.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/Enroller.java
index 8b0fa42..0a580d4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/Enroller.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/Enroller.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb.bmp.handle.mix.ejb;
import java.util.ArrayList;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
import java.rmi.RemoteException;
public interface Enroller extends EJBObject {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/EnrollerBean.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/EnrollerBean.java
index 14fb3fa..5c9d7b3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/EnrollerBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/EnrollerBean.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb.bmp.handle.mix.ejb;
import java.rmi.RemoteException;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.sql.*;
import javax.sql.*;
import java.util.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/EnrollerHome.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/EnrollerHome.java
index bf10869..9898176 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/EnrollerHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/EnrollerHome.java
@@ -17,8 +17,8 @@
package com.sun.s1asdev.ejb.bmp.handle.mix.ejb;
import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBHome;
public interface EnrollerHome extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/Student.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/Student.java
index 918464c..088eef4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/Student.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/Student.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb.bmp.handle.mix.ejb;
import java.util.ArrayList;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
import java.rmi.RemoteException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/StudentBean.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/StudentBean.java
index d7e2d37..7367ef7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/StudentBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/StudentBean.java
@@ -19,7 +19,7 @@
import java.sql.*;
import javax.sql.*;
import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.rmi.PortableRemoteObject;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/StudentHome.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/StudentHome.java
index ab165db..a255dca 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/StudentHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/StudentHome.java
@@ -16,10 +16,10 @@
package com.sun.s1asdev.ejb.bmp.handle.mix.ejb;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.FinderException;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.FinderException;
public interface StudentHome extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/client/ReadOnlyClient.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/client/ReadOnlyClient.java
index 25513c1..2c87087 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/client/ReadOnlyClient.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/client/ReadOnlyClient.java
@@ -23,7 +23,7 @@
import com.sun.s1asdev.ejb.bmp.readonly.ejb.*;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
-import javax.ejb.CreateException;
+import jakarta.ejb.CreateException;
/**
* A simple java client will:
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/descriptor/ejb-jar.xml
index 7b8c91f..a1921fa 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/descriptor/ejb-jar.xml
@@ -184,7 +184,7 @@
<method-intf>Home</method-intf>
<method-name>remove</method-name>
<method-params>
- <method-param>javax.ejb.Handle</method-param>
+ <method-param>jakarta.ejb.Handle</method-param>
</method-params>
</method>
<method>
@@ -239,7 +239,7 @@
<method-intf>Remote</method-intf>
<method-name>isIdentical</method-name>
<method-params>
- <method-param>javax.ejb.EJBObject</method-param>
+ <method-param>jakarta.ejb.EJBObject</method-param>
</method-params>
</method>
<method>
@@ -270,7 +270,7 @@
<method-intf>Home</method-intf>
<method-name>remove</method-name>
<method-params>
- <method-param>javax.ejb.Handle</method-param>
+ <method-param>jakarta.ejb.Handle</method-param>
</method-params>
</method>
<method>
@@ -333,7 +333,7 @@
<method-intf>Remote</method-intf>
<method-name>isIdentical</method-name>
<method-params>
- <method-param>javax.ejb.EJBObject</method-param>
+ <method-param>jakarta.ejb.EJBObject</method-param>
</method-params>
</method>
<method>
@@ -403,7 +403,7 @@
<method-intf>Home</method-intf>
<method-name>remove</method-name>
<method-params>
- <method-param>javax.ejb.Handle</method-param>
+ <method-param>jakarta.ejb.Handle</method-param>
</method-params>
</method>
<method>
@@ -453,7 +453,7 @@
<method-intf>Remote</method-intf>
<method-name>isIdentical</method-name>
<method-params>
- <method-param>javax.ejb.EJBObject</method-param>
+ <method-param>jakarta.ejb.EJBObject</method-param>
</method-params>
</method>
<method>
@@ -507,7 +507,7 @@
<method-intf>Home</method-intf>
<method-name>remove</method-name>
<method-params>
- <method-param>javax.ejb.Handle</method-param>
+ <method-param>jakarta.ejb.Handle</method-param>
</method-params>
</method>
<method>
@@ -557,7 +557,7 @@
<method-intf>Remote</method-intf>
<method-name>isIdentical</method-name>
<method-params>
- <method-param>javax.ejb.EJBObject</method-param>
+ <method-param>jakarta.ejb.EJBObject</method-param>
</method-params>
</method>
<method>
@@ -612,7 +612,7 @@
<method-intf>Home</method-intf>
<method-name>remove</method-name>
<method-params>
- <method-param>javax.ejb.Handle</method-param>
+ <method-param>jakarta.ejb.Handle</method-param>
</method-params>
</method>
<trans-attribute>NotSupported</trans-attribute>
@@ -777,7 +777,7 @@
<method-intf>Home</method-intf>
<method-name>remove</method-name>
<method-params>
- <method-param>javax.ejb.Handle</method-param>
+ <method-param>jakarta.ejb.Handle</method-param>
</method-params>
</method>
<trans-attribute>NotSupported</trans-attribute>
@@ -872,7 +872,7 @@
<method-intf>Home</method-intf>
<method-name>remove</method-name>
<method-params>
- <method-param>javax.ejb.Handle</method-param>
+ <method-param>jakarta.ejb.Handle</method-param>
</method-params>
</method>
<trans-attribute>NotSupported</trans-attribute>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/Course.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/Course.java
index 4657bf6..e75ee64 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/Course.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/Course.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb.bmp.readonly.ejb;
import java.util.ArrayList;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
import java.rmi.RemoteException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/CourseBean.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/CourseBean.java
index 785a4be..f59e86b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/CourseBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/CourseBean.java
@@ -19,7 +19,7 @@
import java.sql.*;
import javax.sql.*;
import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.rmi.PortableRemoteObject;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/CourseHome.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/CourseHome.java
index ad0f63b..a75e2df 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/CourseHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/CourseHome.java
@@ -16,10 +16,10 @@
package com.sun.s1asdev.ejb.bmp.readonly.ejb;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
import java.rmi.RemoteException;
-import javax.ejb.FinderException;
-import javax.ejb.CreateException;
+import jakarta.ejb.FinderException;
+import jakarta.ejb.CreateException;
public interface CourseHome extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/Enroller.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/Enroller.java
index 443a2e3..48f0fd4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/Enroller.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/Enroller.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb.bmp.readonly.ejb;
import java.util.ArrayList;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
import java.rmi.RemoteException;
public interface Enroller extends EJBObject {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/EnrollerBean.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/EnrollerBean.java
index 220365d..e1d41cb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/EnrollerBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/EnrollerBean.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb.bmp.readonly.ejb;
import java.rmi.RemoteException;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.sql.*;
import javax.sql.*;
import java.util.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/EnrollerHome.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/EnrollerHome.java
index 2fee447..41e0ec6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/EnrollerHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/EnrollerHome.java
@@ -17,8 +17,8 @@
package com.sun.s1asdev.ejb.bmp.readonly.ejb;
import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBHome;
public interface EnrollerHome extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/Student.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/Student.java
index bce2a42..0e508b2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/Student.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/Student.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb.bmp.readonly.ejb;
import java.util.ArrayList;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
import java.rmi.RemoteException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentBean.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentBean.java
index d306d1d..245d425 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentBean.java
@@ -19,7 +19,7 @@
import java.sql.*;
import javax.sql.*;
import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.rmi.PortableRemoteObject;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentHome.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentHome.java
index f8298ca..5b8c498 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentHome.java
@@ -16,10 +16,10 @@
package com.sun.s1asdev.ejb.bmp.readonly.ejb;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.FinderException;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.FinderException;
public interface StudentHome extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentHomeMutable.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentHomeMutable.java
index 018b3fe..09d307c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentHomeMutable.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentHomeMutable.java
@@ -16,10 +16,10 @@
package com.sun.s1asdev.ejb.bmp.readonly.ejb;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.FinderException;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.FinderException;
public interface StudentHomeMutable extends StudentHome {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentLocal.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentLocal.java
index 19accfa..7d2fd28 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentLocal.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentLocal.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb.bmp.readonly.ejb;
import java.util.ArrayList;
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
public interface StudentLocal extends EJBLocalObject {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentLocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentLocalHome.java
index 43a42dc..c79588f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentLocalHome.java
@@ -16,10 +16,10 @@
package com.sun.s1asdev.ejb.bmp.readonly.ejb;
-import javax.ejb.EJBLocalHome;
+import jakarta.ejb.EJBLocalHome;
-import javax.ejb.CreateException;
-import javax.ejb.FinderException;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.FinderException;
public interface StudentLocalHome extends EJBLocalHome {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/ejb/SimpleBMP.java
index 230daf6..34fd4ab 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.bmp.simple.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMP
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/ejb/SimpleBMPBean.java
index 8ea7c06..b5eb26d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.bmp.simple.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.rmi.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/ejb/SimpleBMPHome.java
index 83afc02..7f6b502 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.bmp.simple.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMPHome
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/ejb/Test.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/ejb/Test.java
index ee97ea3..fb6a836 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/ejb/Test.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/ejb/Test.java
@@ -14,7 +14,7 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface Test extends EJBObject {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/ejb/TestBMP.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/ejb/TestBMP.java
index 67b2194..029a59b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/ejb/TestBMP.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/ejb/TestBMP.java
@@ -14,7 +14,7 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.rmi.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/ejb/TestHome.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/ejb/TestHome.java
index f4cc549..103f42f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/ejb/TestHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/ejb/TestHome.java
@@ -14,7 +14,7 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface TestHome extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/ejb/SimpleBMP.java
index 230daf6..34fd4ab 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.bmp.simple.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMP
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/ejb/SimpleBMPBean.java
index 8ea7c06..b5eb26d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.bmp.simple.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.rmi.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/ejb/SimpleBMPHome.java
index 83afc02..7f6b502 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.bmp.simple.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMPHome
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/SimpleBMP.java
index 0525d65..a541bd4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.bmp.twolevel.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMP
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/SimpleBMPBean.java
index b174652..6326b5b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.bmp.twolevel.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.rmi.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/SimpleBMPHome.java
index fa93d6f..0ea7b0e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.bmp.twolevel.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMPHome
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/Stateless.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/Stateless.java
index f62ea74..6791857 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/Stateless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/Stateless.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.bmp.twolevel.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface Stateless
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/StatelessBean.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/StatelessBean.java
index 04c75ed..3cc403e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/StatelessBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/StatelessBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.bmp.twolevel.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.rmi.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/StatelessHome.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/StatelessHome.java
index af9b4bf..d45e67e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/StatelessHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/StatelessHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.bmp.twolevel.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface StatelessHome
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/ejb/SimpleBMP.java
index c587d19..a7379bb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.bmp.txtests.simple.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMP
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/ejb/SimpleBMPBean.java
index 8ef8236..e171eab 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.bmp.txtests.simple.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.rmi.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/ejb/SimpleBMPHome.java
index c1f6e00..40b9391 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.bmp.txtests.simple.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMPHome
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/client/Client.java
index b1f91aa..f28da27 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/client/Client.java
@@ -18,7 +18,7 @@
import javax.naming.*;
import jakarta.jms.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.rmi.PortableRemoteObject;
import com.sun.s1asdev.ejb.bmp.txtests.stateless.ejb.SLSBHome;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SLSB.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SLSB.java
index 8192557..65d066a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SLSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SLSB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.bmp.txtests.stateless.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface SLSB
extends EJBObject
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SLSBEJB.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SLSBEJB.java
index ad41ba3..2ddf9ab 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SLSBEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SLSBEJB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.bmp.txtests.stateless.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import com.sun.s1asdev.ejb.bmp.txtests.simple.ejb.SimpleBMPHome;
import com.sun.s1asdev.ejb.bmp.txtests.simple.ejb.SimpleBMP;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SLSBHome.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SLSBHome.java
index ab95eeb..9c332eb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SLSBHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SLSBHome.java
@@ -17,8 +17,8 @@
package com.sun.s1asdev.ejb.bmp.txtests.stateless.ejb;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface SLSBHome
extends EJBHome
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SimpleBMP.java
index c587d19..a7379bb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.bmp.txtests.simple.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMP
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SimpleBMPHome.java
index c1f6e00..40b9391 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.bmp.txtests.simple.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMPHome
diff --git a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/client/Client.java
index 9ceee79..4b94bf3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/client/Client.java
@@ -18,7 +18,7 @@
import java.io.*;
import java.util.*;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
import javax.naming.*;
import javax.rmi.PortableRemoteObject;
import org.omg.CORBA.ORB;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/Foo.java b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/Foo.java
index 6a97929..b0c41ad 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/Foo.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/Foo.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.classload.lifecycle;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.Remote;
import java.rmi.RemoteException;
import java.io.Serializable;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/FooBean.java b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/FooBean.java
index 8f96176..a92bc1b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/FooBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/FooBean.java
@@ -19,9 +19,9 @@
import java.util.Enumeration;
import java.io.Serializable;
import java.rmi.RemoteException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
import javax.naming.*;
import javax.rmi.PortableRemoteObject;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/FooHome.java b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/FooHome.java
index 7d907e3..43b44a3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/FooHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/FooHome.java
@@ -19,8 +19,8 @@
import java.io.Serializable;
import java.rmi.Remote;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface FooHome extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cli/negative/ejb/MyBean.java b/appserver/tests/appserv-tests/devtests/ejb/cli/negative/ejb/MyBean.java
index 52da57d..2671c71 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cli/negative/ejb/MyBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cli/negative/ejb/MyBean.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
@Stateless
public class MyBean implements MyBeanRemoteIntf {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cli/negative/ejb/MyBeanRemoteIntf.java b/appserver/tests/appserv-tests/devtests/ejb/cli/negative/ejb/MyBeanRemoteIntf.java
index d47627e..c975953 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cli/negative/ejb/MyBeanRemoteIntf.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cli/negative/ejb/MyBeanRemoteIntf.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
@Remote
public interface MyBeanRemoteIntf {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A1Bean.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A1Bean.java
index f7ca573..b5b7e32 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A1Bean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A1Bean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejbflush;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
/**
@@ -25,21 +25,21 @@
*/
-public class A1Bean implements javax.ejb.EntityBean {
+public class A1Bean implements jakarta.ejb.EntityBean {
- private javax.ejb.EntityContext context;
+ private jakarta.ejb.EntityContext context;
/**
- * @see javax.ejb.EntityBean#setEntityContext(javax.ejb.EntityContext)
+ * @see jakarta.ejb.EntityBean#setEntityContext(jakarta.ejb.EntityContext)
*/
- public void setEntityContext(javax.ejb.EntityContext aContext) {
+ public void setEntityContext(jakarta.ejb.EntityContext aContext) {
context=aContext;
}
/**
- * @see javax.ejb.EntityBean#ejbActivate()
+ * @see jakarta.ejb.EntityBean#ejbActivate()
*/
public void ejbActivate() {
@@ -47,7 +47,7 @@
/**
- * @see javax.ejb.EntityBean#ejbPassivate()
+ * @see jakarta.ejb.EntityBean#ejbPassivate()
*/
public void ejbPassivate() {
@@ -55,7 +55,7 @@
/**
- * @see javax.ejb.EntityBean#ejbRemove()
+ * @see jakarta.ejb.EntityBean#ejbRemove()
*/
public void ejbRemove() {
System.out.println("Debug: A1Bean ejbRemove");
@@ -63,7 +63,7 @@
/**
- * @see javax.ejb.EntityBean#unsetEntityContext()
+ * @see jakarta.ejb.EntityBean#unsetEntityContext()
*/
public void unsetEntityContext() {
context=null;
@@ -71,7 +71,7 @@
/**
- * @see javax.ejb.EntityBean#ejbLoad()
+ * @see jakarta.ejb.EntityBean#ejbLoad()
*/
public void ejbLoad() {
@@ -79,7 +79,7 @@
/**
- * @see javax.ejb.EntityBean#ejbStore()
+ * @see jakarta.ejb.EntityBean#ejbStore()
*/
public void ejbStore() {
}
@@ -87,14 +87,14 @@
public java.lang.String id;
public java.lang.String name;
- public java.lang.String ejbCreate(java.lang.String id) throws javax.ejb.CreateException {
+ public java.lang.String ejbCreate(java.lang.String id) throws jakarta.ejb.CreateException {
this.id = id;
name = "ABC";
return null;
}
- public void ejbPostCreate(java.lang.String id) throws javax.ejb.CreateException {
+ public void ejbPostCreate(java.lang.String id) throws jakarta.ejb.CreateException {
}
public void setName(String s) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A1Local.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A1Local.java
index ae43b72..bd56f6d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A1Local.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A1Local.java
@@ -16,13 +16,13 @@
package com.sun.s1asdev.ejb.ejbflush;
-import javax.ejb.*;
+import jakarta.ejb.*;
/**
* @author mvatkina
*/
-public interface A1Local extends javax.ejb.EJBLocalObject {
+public interface A1Local extends jakarta.ejb.EJBLocalObject {
public void setName(String name);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A1LocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A1LocalHome.java
index e6fdaf5..9057982 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A1LocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A1LocalHome.java
@@ -16,17 +16,17 @@
package com.sun.s1asdev.ejb.ejbflush;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.util.*;
/**
* @author mvatkina
*/
-public interface A1LocalHome extends javax.ejb.EJBLocalHome {
+public interface A1LocalHome extends jakarta.ejb.EJBLocalHome {
- public A1Local findByPrimaryKey(java.lang.String pk) throws javax.ejb.FinderException;
+ public A1Local findByPrimaryKey(java.lang.String pk) throws jakarta.ejb.FinderException;
- public A1Local create(java.lang.String id) throws javax.ejb.CreateException;
+ public A1Local create(java.lang.String id) throws jakarta.ejb.CreateException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A2Bean.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A2Bean.java
index a9e34f3..28cc6b5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A2Bean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A2Bean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejbflush;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
/**
@@ -25,21 +25,21 @@
*/
-public abstract class A2Bean implements javax.ejb.EntityBean {
+public abstract class A2Bean implements jakarta.ejb.EntityBean {
- private javax.ejb.EntityContext context;
+ private jakarta.ejb.EntityContext context;
/**
- * @see javax.ejb.EntityBean#setEntityContext(javax.ejb.EntityContext)
+ * @see jakarta.ejb.EntityBean#setEntityContext(jakarta.ejb.EntityContext)
*/
- public void setEntityContext(javax.ejb.EntityContext aContext) {
+ public void setEntityContext(jakarta.ejb.EntityContext aContext) {
context=aContext;
}
/**
- * @see javax.ejb.EntityBean#ejbActivate()
+ * @see jakarta.ejb.EntityBean#ejbActivate()
*/
public void ejbActivate() {
@@ -47,7 +47,7 @@
/**
- * @see javax.ejb.EntityBean#ejbPassivate()
+ * @see jakarta.ejb.EntityBean#ejbPassivate()
*/
public void ejbPassivate() {
@@ -55,7 +55,7 @@
/**
- * @see javax.ejb.EntityBean#ejbRemove()
+ * @see jakarta.ejb.EntityBean#ejbRemove()
*/
public void ejbRemove() {
System.out.println("Debug: A2Bean ejbRemove");
@@ -63,7 +63,7 @@
/**
- * @see javax.ejb.EntityBean#unsetEntityContext()
+ * @see jakarta.ejb.EntityBean#unsetEntityContext()
*/
public void unsetEntityContext() {
context=null;
@@ -71,7 +71,7 @@
/**
- * @see javax.ejb.EntityBean#ejbLoad()
+ * @see jakarta.ejb.EntityBean#ejbLoad()
*/
public void ejbLoad() {
@@ -79,7 +79,7 @@
/**
- * @see javax.ejb.EntityBean#ejbStore()
+ * @see jakarta.ejb.EntityBean#ejbStore()
*/
public void ejbStore() {
}
@@ -90,14 +90,14 @@
public abstract java.lang.String getName() ;
public abstract void setName(java.lang.String s) ;
- public java.lang.String ejbCreate(java.lang.String id) throws javax.ejb.CreateException {
+ public java.lang.String ejbCreate(java.lang.String id) throws jakarta.ejb.CreateException {
setId(id);
setName("ABC");
return null;
}
- public void ejbPostCreate(java.lang.String name) throws javax.ejb.CreateException {
+ public void ejbPostCreate(java.lang.String name) throws jakarta.ejb.CreateException {
}
public void setNameWithFlush(java.lang.String s) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A2Local.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A2Local.java
index c4108c3..0cbc08f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A2Local.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A2Local.java
@@ -16,14 +16,14 @@
package com.sun.s1asdev.ejb.ejbflush;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.util.*;
/**
* @author mvatkina
*/
-public interface A2Local extends javax.ejb.EJBLocalObject {
+public interface A2Local extends jakarta.ejb.EJBLocalObject {
public void setName(String name);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A2LocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A2LocalHome.java
index 3ca6e66..739003c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A2LocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A2LocalHome.java
@@ -16,17 +16,17 @@
package com.sun.s1asdev.ejb.ejbflush;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.util.*;
/**
* @author mvatkina
*/
-public interface A2LocalHome extends javax.ejb.EJBLocalHome {
+public interface A2LocalHome extends jakarta.ejb.EJBLocalHome {
- public A2Local findByPrimaryKey(java.lang.String pk) throws javax.ejb.FinderException;
+ public A2Local findByPrimaryKey(java.lang.String pk) throws jakarta.ejb.FinderException;
- public A2Local create(java.lang.String name) throws javax.ejb.CreateException;
+ public A2Local create(java.lang.String name) throws jakarta.ejb.CreateException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/Test.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/Test.java
index 8353902..e436599 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/Test.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/Test.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejbflush;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface Test extends EJBObject {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/TestBean.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/TestBean.java
index 3cddc82..68162d1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/TestBean.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb.ejbflush;
import javax.naming.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
public class TestBean implements SessionBean {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/TestHome.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/TestHome.java
index 1429ed5..4e903cc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/TestHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/TestHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejbflush;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface TestHome extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/descriptor/ejb-jar-customer.xml b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/descriptor/ejb-jar-customer.xml
index e2f8743..bfa035c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/descriptor/ejb-jar-customer.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/descriptor/ejb-jar-customer.xml
@@ -154,7 +154,7 @@
<method-intf></method-intf>
<method-name>isIdentical</method-name>
<method-params>
- <method-param>javax.ejb.EJBObject</method-param>
+ <method-param>jakarta.ejb.EJBObject</method-param>
</method-params>
</method>
<method>
@@ -254,7 +254,7 @@
<method-intf></method-intf>
<method-name>isIdentical</method-name>
<method-params>
- <method-param>javax.ejb.EJBObject</method-param>
+ <method-param>jakarta.ejb.EJBObject</method-param>
</method-params>
</method>
</method-permission>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerBean.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerBean.java
index c36a034..fa37d56 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerBean.java
@@ -17,7 +17,7 @@
package com.sun.s1peqe.ejb.cmp.preselect.ejb;
import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import java.rmi.RemoteException;
import javax.rmi.PortableRemoteObject;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerHome.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerHome.java
index 06dbbc8..f9c6a10 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerHome.java
@@ -17,7 +17,7 @@
package com.sun.s1peqe.ejb.cmp.preselect.ejb;
import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
public interface CustomerHome extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerLocal.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerLocal.java
index d7001a1..28bd5c3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerLocal.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerLocal.java
@@ -17,7 +17,7 @@
package com.sun.s1peqe.ejb.cmp.preselect.ejb;
import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface CustomerLocal extends EJBLocalObject {
public String getId();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerLocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerLocalHome.java
index d1419d5..5d0c2bb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerLocalHome.java
@@ -17,7 +17,7 @@
package com.sun.s1peqe.ejb.cmp.preselect.ejb;
import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface CustomerLocalHome extends EJBLocalHome {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerRemote.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerRemote.java
index 64cfabf..5abd5b1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerRemote.java
@@ -17,7 +17,7 @@
package com.sun.s1peqe.ejb.cmp.preselect.ejb;
import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
public interface CustomerRemote extends EJBObject {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemBean.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemBean.java
index de2aae0..38e2294 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemBean.java
@@ -17,7 +17,7 @@
package com.sun.s1peqe.ejb.cmp.preselect.ejb;
import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
public abstract class ItemBean implements EntityBean {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemHome.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemHome.java
index ad0e296..1061db6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemHome.java
@@ -17,7 +17,7 @@
package com.sun.s1peqe.ejb.cmp.preselect.ejb;
import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
public interface ItemHome extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemLocal.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemLocal.java
index a20157b..beecd09 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemLocal.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemLocal.java
@@ -17,7 +17,7 @@
package com.sun.s1peqe.ejb.cmp.preselect.ejb;
import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface ItemLocal extends EJBLocalObject, java.io.Serializable {
public String getId();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemLocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemLocalHome.java
index 5a9c618..06c57cd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemLocalHome.java
@@ -17,7 +17,7 @@
package com.sun.s1peqe.ejb.cmp.preselect.ejb;
import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface ItemLocalHome extends EJBLocalHome {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemRemote.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemRemote.java
index 8001e75..4656e05 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemRemote.java
@@ -17,7 +17,7 @@
package com.sun.s1peqe.ejb.cmp.preselect.ejb;
import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
public interface ItemRemote extends EJBObject {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/client/ReadOnlyClient.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/client/ReadOnlyClient.java
index e7d8892..0547214 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/client/ReadOnlyClient.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/client/ReadOnlyClient.java
@@ -23,8 +23,8 @@
import com.sun.s1asdev.ejb.cmp.readonly.ejb.*;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
-import javax.ejb.EJBException;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.CreateException;
import java.rmi.RemoteException;
/**
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/Student.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/Student.java
index 79ca5fd..96dec44 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/Student.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/Student.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb.cmp.readonly.ejb;
import java.util.ArrayList;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
import java.rmi.RemoteException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentBean.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentBean.java
index 8e49ba0..88f7fe6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentBean.java
@@ -19,7 +19,7 @@
import java.sql.*;
import javax.sql.*;
import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.rmi.PortableRemoteObject;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentHome.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentHome.java
index 3615135..29b022d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentHome.java
@@ -16,10 +16,10 @@
package com.sun.s1asdev.ejb.cmp.readonly.ejb;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.FinderException;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.FinderException;
public interface StudentHome extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentLocal.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentLocal.java
index e1f2d27..555eed5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentLocal.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentLocal.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb.cmp.readonly.ejb;
import java.util.ArrayList;
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
public interface StudentLocal extends EJBLocalObject {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentLocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentLocalHome.java
index 105db34..59b6166 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentLocalHome.java
@@ -16,10 +16,10 @@
package com.sun.s1asdev.ejb.cmp.readonly.ejb;
-import javax.ejb.EJBLocalHome;
+import jakarta.ejb.EJBLocalHome;
-import javax.ejb.CreateException;
-import javax.ejb.FinderException;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.FinderException;
public interface StudentLocalHome extends EJBLocalHome {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java
index 5f1e9d9..99d3582 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java
@@ -24,9 +24,9 @@
import java.io.Serializable;
import java.util.concurrent.atomic.AtomicInteger;
import jakarta.annotation.PreDestroy;
-import javax.ejb.LocalBean;
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
+import jakarta.ejb.LocalBean;
+import jakarta.ejb.Remove;
+import jakarta.ejb.Stateful;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java
index 5f1e9d9..99d3582 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java
@@ -24,9 +24,9 @@
import java.io.Serializable;
import java.util.concurrent.atomic.AtomicInteger;
import jakarta.annotation.PreDestroy;
-import javax.ejb.LocalBean;
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
+import jakarta.ejb.LocalBean;
+import jakarta.ejb.Remove;
+import jakarta.ejb.Stateful;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/src/java/net/max/ee/sfsb/CheckpointedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/src/java/net/max/ee/sfsb/CheckpointedBean.java
index 0006085..3149f59 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/src/java/net/max/ee/sfsb/CheckpointedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/src/java/net/max/ee/sfsb/CheckpointedBean.java
@@ -24,11 +24,11 @@
import java.io.Serializable;
import java.util.concurrent.atomic.AtomicInteger;
import jakarta.annotation.PreDestroy;
-import javax.ejb.LocalBean;
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.LocalBean;
+import jakarta.ejb.Remove;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java
index 5f1e9d9..99d3582 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java
@@ -24,9 +24,9 @@
import java.io.Serializable;
import java.util.concurrent.atomic.AtomicInteger;
import jakarta.annotation.PreDestroy;
-import javax.ejb.LocalBean;
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
+import jakarta.ejb.LocalBean;
+import jakarta.ejb.Remove;
+import jakarta.ejb.Stateful;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java
index 5f1e9d9..99d3582 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java
@@ -24,9 +24,9 @@
import java.io.Serializable;
import java.util.concurrent.atomic.AtomicInteger;
import jakarta.annotation.PreDestroy;
-import javax.ejb.LocalBean;
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
+import jakarta.ejb.LocalBean;
+import jakarta.ejb.Remove;
+import jakarta.ejb.Stateful;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java
index 5f1e9d9..99d3582 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java
@@ -24,9 +24,9 @@
import java.io.Serializable;
import java.util.concurrent.atomic.AtomicInteger;
import jakarta.annotation.PreDestroy;
-import javax.ejb.LocalBean;
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
+import jakarta.ejb.LocalBean;
+import jakarta.ejb.Remove;
+import jakarta.ejb.Stateful;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java
index 5f1e9d9..99d3582 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java
@@ -24,9 +24,9 @@
import java.io.Serializable;
import java.util.concurrent.atomic.AtomicInteger;
import jakarta.annotation.PreDestroy;
-import javax.ejb.LocalBean;
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
+import jakarta.ejb.LocalBean;
+import jakarta.ejb.Remove;
+import jakarta.ejb.Stateful;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/src/java/net/max/ee/sfsb/SimpleShoppingCartBean.java b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/src/java/net/max/ee/sfsb/SimpleShoppingCartBean.java
index d54fc30..af81959 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/src/java/net/max/ee/sfsb/SimpleShoppingCartBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/src/java/net/max/ee/sfsb/SimpleShoppingCartBean.java
@@ -25,9 +25,9 @@
import java.util.ArrayList;
import java.util.concurrent.atomic.AtomicInteger;
import jakarta.annotation.PreDestroy;
-import javax.ejb.LocalBean;
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
+import jakarta.ejb.LocalBean;
+import jakarta.ejb.Remove;
+import jakarta.ejb.Stateful;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/client/Client.java
index 2c55c94..bd1e4ef 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/client/Client.java
@@ -18,7 +18,7 @@
import javax.naming.*;
import jakarta.jms.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.rmi.PortableRemoteObject;
import com.sun.s1asdev.ejb.ee.ejb.SFSBHome;
import com.sun.s1asdev.ejb.ee.ejb.SFSB;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/ejb/SFSB.java b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/ejb/SFSB.java
index e0a80f7..69b1e1f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/ejb/SFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/ejb/SFSB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ee.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
public interface SFSB
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/ejb/SFSBEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/ejb/SFSBEJB.java
index 6cae113..4ab6beb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/ejb/SFSBEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/ejb/SFSBEJB.java
@@ -16,9 +16,9 @@
package com.sun.s1asdev.ejb.ee.ejb;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.*;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.*;
import javax.naming.Context;
import javax.naming.InitialContext;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/ejb/SFSBHome.java b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/ejb/SFSBHome.java
index 92834b9..f623efb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/ejb/SFSBHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/ejb/SFSBHome.java
@@ -17,8 +17,8 @@
package com.sun.s1asdev.ejb.ee.ejb;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface SFSBHome
extends EJBHome
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/client/Client.java
index fdba62a..b420d80 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/client/Client.java
@@ -18,7 +18,7 @@
import javax.naming.*;
import jakarta.jms.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.rmi.PortableRemoteObject;
import com.sun.s1asdev.ejb.ee.ejb.SFSBHome;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/ejb/SFSB.java b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/ejb/SFSB.java
index 8841227..cbfd931 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/ejb/SFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/ejb/SFSB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ee.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
public interface SFSB
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/ejb/SFSBEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/ejb/SFSBEJB.java
index 0fd1163..d9bd214 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/ejb/SFSBEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/ejb/SFSBEJB.java
@@ -16,9 +16,9 @@
package com.sun.s1asdev.ejb.ee.ejb;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.*;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.*;
import javax.naming.Context;
import javax.naming.InitialContext;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/ejb/SFSBHome.java b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/ejb/SFSBHome.java
index 1d939b3..a3f4a97 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/ejb/SFSBHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/ejb/SFSBHome.java
@@ -17,8 +17,8 @@
package com.sun.s1asdev.ejb.ee.ejb;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface SFSBHome
extends EJBHome
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/autotimer/war/MyBean.java b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/autotimer/war/MyBean.java
index 19d94a1..70480c5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/autotimer/war/MyBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/autotimer/war/MyBean.java
@@ -23,7 +23,7 @@
import java.util.Collection;
import java.util.HashSet;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.Resource;
/**
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/autotimer/war/VerifyServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/autotimer/war/VerifyServlet.java
index d11e41f..ec1cf70 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/autotimer/war/VerifyServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/autotimer/war/VerifyServlet.java
@@ -16,8 +16,8 @@
package com.acme;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
import java.io.IOException;
import java.io.PrintWriter;
import java.sql.Connection;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/cli/src/eetimer/CreateTimersBean.java b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/cli/src/eetimer/CreateTimersBean.java
index f676e24..0f7cb35 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/cli/src/eetimer/CreateTimersBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/cli/src/eetimer/CreateTimersBean.java
@@ -20,10 +20,10 @@
import java.util.logging.Level;
import java.util.logging.Logger;
import jakarta.annotation.Resource;
-import javax.ejb.Singleton;
-import javax.ejb.TimedObject;
-import javax.ejb.Timer;
-import javax.ejb.TimerService;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.TimedObject;
+import jakarta.ejb.Timer;
+import jakarta.ejb.TimerService;
@Singleton
public class CreateTimersBean implements TimedObject {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/cli/src/eetimer/StartupSingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/cli/src/eetimer/StartupSingletonBean.java
index 6d63d1b..79ec67e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/cli/src/eetimer/StartupSingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/cli/src/eetimer/StartupSingletonBean.java
@@ -17,9 +17,9 @@
package eetimer;
import jakarta.annotation.PostConstruct;
-import javax.ejb.EJB;
-import javax.ejb.Singleton;
-import javax.ejb.Startup;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup;
@Singleton
@Startup()
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/domaindeployment/war/MyBean.java b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/domaindeployment/war/MyBean.java
index b8a68ae..406a27b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/domaindeployment/war/MyBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/domaindeployment/war/MyBean.java
@@ -22,7 +22,7 @@
package com.acme;
import java.util.Collection;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.Resource;
/**
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/domaindeployment/war/VerifyServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/domaindeployment/war/VerifyServlet.java
index dde8ad8..38128dc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/domaindeployment/war/VerifyServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/domaindeployment/war/VerifyServlet.java
@@ -16,8 +16,8 @@
package com.acme;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
import java.io.IOException;
import java.io.PrintWriter;
import java.sql.Connection;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/failover/war/MyBean.java b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/failover/war/MyBean.java
index f0ea46e..fcf2ec1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/failover/war/MyBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/failover/war/MyBean.java
@@ -23,7 +23,7 @@
import java.util.Collection;
import java.util.HashSet;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.Resource;
/**
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/failover/war/VerifyServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/failover/war/VerifyServlet.java
index d11e41f..ec1cf70 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/failover/war/VerifyServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/failover/war/VerifyServlet.java
@@ -16,8 +16,8 @@
package com.acme;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
import java.io.IOException;
import java.io.PrintWriter;
import java.sql.Connection;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/getalltimers/war/SgltTimerBean.java b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/getalltimers/war/SgltTimerBean.java
index 621c41b..dd2de94 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/getalltimers/war/SgltTimerBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/getalltimers/war/SgltTimerBean.java
@@ -19,7 +19,7 @@
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.Resource;
@Singleton
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/getalltimers/war/StlesTimerBean.java b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/getalltimers/war/StlesTimerBean.java
index a7f004a..72cf2c3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/getalltimers/war/StlesTimerBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/getalltimers/war/StlesTimerBean.java
@@ -17,15 +17,15 @@
package com.acme;
import jakarta.annotation.Resource;
-import javax.ejb.Schedule;
-import javax.ejb.ScheduleExpression;
-import javax.ejb.Schedules;
-import javax.ejb.Singleton;
-import javax.ejb.Stateless;
-import javax.ejb.Timeout;
-import javax.ejb.Timer;
-import javax.ejb.TimerConfig;
-import javax.ejb.TimerService;
+import jakarta.ejb.Schedule;
+import jakarta.ejb.ScheduleExpression;
+import jakarta.ejb.Schedules;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.Timeout;
+import jakarta.ejb.Timer;
+import jakarta.ejb.TimerConfig;
+import jakarta.ejb.TimerService;
import java.util.HashSet;
@Stateless
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/getalltimers/war/VerifyServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/getalltimers/war/VerifyServlet.java
index 5524c86..dfbd976 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/getalltimers/war/VerifyServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/getalltimers/war/VerifyServlet.java
@@ -16,8 +16,8 @@
package com.acme;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
import java.io.IOException;
import java.io.PrintWriter;
import java.sql.Connection;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/client/Client.java
index a601ace..12edff9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/client/Client.java
@@ -18,7 +18,7 @@
import javax.naming.*;
import jakarta.jms.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.rmi.PortableRemoteObject;
import com.sun.s1asdev.ejb.ee.ejb.BMTSessionHome;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/BMTSession.java b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/BMTSession.java
index 16d22db..8b8837d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/BMTSession.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/BMTSession.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ee.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
public interface BMTSession
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/BMTSessionBean.java b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/BMTSessionBean.java
index fcd7774..91ad222 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/BMTSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/BMTSessionBean.java
@@ -16,9 +16,9 @@
package com.sun.s1asdev.ejb.ee.ejb;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.*;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.*;
import javax.naming.Context;
import javax.naming.InitialContext;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/BMTSessionHome.java b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/BMTSessionHome.java
index 60183bc..5af1269 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/BMTSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/BMTSessionHome.java
@@ -17,8 +17,8 @@
package com.sun.s1asdev.ejb.ee.ejb;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface BMTSessionHome
extends EJBHome
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/CMTSession.java b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/CMTSession.java
index 99e8807..8105e44 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/CMTSession.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/CMTSession.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ee.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
public interface CMTSession
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/CMTSessionBean.java b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/CMTSessionBean.java
index 895dec3..c7c26b6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/CMTSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/CMTSessionBean.java
@@ -16,9 +16,9 @@
package com.sun.s1asdev.ejb.ee.ejb;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.*;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.*;
import javax.naming.Context;
import javax.naming.InitialContext;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/CMTSessionHome.java b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/CMTSessionHome.java
index a4077df..1b72c60 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/CMTSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/CMTSessionHome.java
@@ -17,8 +17,8 @@
package com.sun.s1asdev.ejb.ee.ejb;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface CMTSessionHome
extends EJBHome
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/client/Client.java
index 2c85d8b..1b3aea0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/client/Client.java
@@ -18,7 +18,7 @@
import javax.naming.*;
import jakarta.jms.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.rmi.PortableRemoteObject;
import com.sun.s1asdev.ejb.ee.ejb.BMTSessionHome;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/ejb/BMTSession.java b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/ejb/BMTSession.java
index 4ea96de..117d1cc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/ejb/BMTSession.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/ejb/BMTSession.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ee.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
public interface BMTSession
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/ejb/BMTSessionBean.java b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/ejb/BMTSessionBean.java
index 3d84d20..71cb378 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/ejb/BMTSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/ejb/BMTSessionBean.java
@@ -16,9 +16,9 @@
package com.sun.s1asdev.ejb.ee.ejb;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.*;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.*;
import javax.naming.Context;
import javax.naming.InitialContext;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/ejb/BMTSessionHome.java b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/ejb/BMTSessionHome.java
index 60183bc..5af1269 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/ejb/BMTSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/ejb/BMTSessionHome.java
@@ -17,8 +17,8 @@
package com.sun.s1asdev.ejb.ee.ejb;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface BMTSessionHome
extends EJBHome
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/client/Client.java
index 7b60351..e3917bf 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/client/Client.java
@@ -18,7 +18,7 @@
import javax.naming.*;
import jakarta.jms.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.rmi.PortableRemoteObject;
import com.sun.s1asdev.ejb.ee.txcheckpoint.simpletx.ejb.SFSBHome;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/ejb/SFSB.java b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/ejb/SFSB.java
index 6d25f9f..50288b5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/ejb/SFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/ejb/SFSB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ee.txcheckpoint.simpletx.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
public interface SFSB
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/ejb/SFSBEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/ejb/SFSBEJB.java
index 057e53c..9ac0024 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/ejb/SFSBEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/ejb/SFSBEJB.java
@@ -16,9 +16,9 @@
package com.sun.s1asdev.ejb.ee.txcheckpoint.simpletx.ejb;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.*;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.*;
import javax.naming.Context;
import javax.naming.InitialContext;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/ejb/SFSBHome.java b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/ejb/SFSBHome.java
index a1a9d32..82a15e9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/ejb/SFSBHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/ejb/SFSBHome.java
@@ -17,8 +17,8 @@
package com.sun.s1asdev.ejb.ee.txcheckpoint.simpletx.ejb;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface SFSBHome
extends EJBHome
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/client/Client.java
index a0e5226..8f45ca5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/client/Client.java
@@ -19,7 +19,7 @@
import java.io.*;
import java.util.*;
import javax.naming.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import com.sun.ejb.devtest.Sless;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/BMTOperation.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/BMTOperation.java
index 2c46291..90ab392 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/BMTOperation.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/BMTOperation.java
@@ -16,7 +16,7 @@
package com.sun.ejb.devtest;
-import javax.ejb.Local;
+import jakarta.ejb.Local;
@Local
public interface BMTOperation
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/BMTSfulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/BMTSfulBean.java
index b81a065..6e26eff 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/BMTSfulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/BMTSfulBean.java
@@ -16,9 +16,9 @@
package com.sun.ejb.devtest;
-import javax.ejb.Stateful;
-import javax.ejb.TransactionManagement;
-import javax.ejb.TransactionManagementType;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.TransactionManagement;
+import jakarta.ejb.TransactionManagementType;
import javax.naming.InitialContext;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/CMTOperation.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/CMTOperation.java
index 2d8f938..e80b430 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/CMTOperation.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/CMTOperation.java
@@ -16,7 +16,7 @@
package com.sun.ejb.devtest;
-import javax.ejb.Local;
+import jakarta.ejb.Local;
@Local
public interface CMTOperation
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/CMTSfulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/CMTSfulBean.java
index f040b87..1fc8e49 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/CMTSfulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/CMTSfulBean.java
@@ -16,7 +16,7 @@
package com.sun.ejb.devtest;
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
import javax.naming.InitialContext;
@Stateful
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/Operation.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/Operation.java
index fd4f15a..1e24b90 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/Operation.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/Operation.java
@@ -16,7 +16,7 @@
package com.sun.ejb.devtest;
-import javax.ejb.Local;
+import jakarta.ejb.Local;
@Local
public interface Operation {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/Sless.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/Sless.java
index 21d58bf..fbe66a3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/Sless.java
@@ -16,7 +16,7 @@
package com.sun.ejb.devtest;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface Sless {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/SlessBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/SlessBean.java
index 9cf6de2..d26cd03 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/SlessBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/SlessBean.java
@@ -16,8 +16,8 @@
package com.sun.ejb.devtest;
-import javax.ejb.Stateless;
-import javax.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.EJB;
@Stateless
public class SlessBean
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/client/Client.java
index a8061f1..a9a712c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/client/Client.java
@@ -18,7 +18,7 @@
import java.io.*;
import java.util.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import org.omg.CORBA.ORB;
import com.sun.s1asdev.ejb.ejb30.clientview.adapted.*;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/Common.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/Common.java
index 958017c..c5c7ae2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/Common.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/Common.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.clientview.adapted;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface Common
{
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/DummyEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/DummyEJB.java
index 05a1566..2d83c26 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/DummyEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/DummyEJB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.clientview.adapted;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import java.util.*;
import javax.rmi.PortableRemoteObject;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/DummyEJBRemoteSless.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/DummyEJBRemoteSless.java
index 8237321..8fb2e38 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/DummyEJBRemoteSless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/DummyEJBRemoteSless.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.clientview.adapted;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import java.util.*;
import javax.rmi.PortableRemoteObject;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/DummyRemote.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/DummyRemote.java
index 91b7681..ad078a6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/DummyRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/DummyRemote.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.clientview.adapted;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface DummyRemote
{
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/DummyRemote2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/DummyRemote2.java
index 7d13ee7..fe95199 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/DummyRemote2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/DummyRemote2.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.clientview.adapted;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface DummyRemote2
{
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/DummySlessRemote.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/DummySlessRemote.java
index a9ea221..7a2740f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/DummySlessRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/DummySlessRemote.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.clientview.adapted;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface DummySlessRemote
{
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/DummySlessRemote2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/DummySlessRemote2.java
index 1039368..a691c25 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/DummySlessRemote2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/DummySlessRemote2.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.clientview.adapted;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface DummySlessRemote2
{
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/Hello.java
index 1ff1099..55b0525 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/Hello.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.clientview.adapted;
-import javax.ejb.FinderException;
+import jakarta.ejb.FinderException;
// Remote business interface
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/HelloEJB.java
index c9905ec..17e540b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/HelloEJB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.clientview.adapted;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import java.util.*;
import javax.rmi.PortableRemoteObject;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/Sful.java
index 3ef3a6e..7855dbf 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/Sful.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.clientview.adapted;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface Sful extends Common, EJBLocalObject
{}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulEJB.java
index f4d40f2..0e03859 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulEJB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.clientview.adapted;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.Resource;
import jakarta.annotation.PreDestroy;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulHome.java
index dafb9fb..335b34b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.clientview.adapted;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface SfulHome extends EJBLocalHome
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulRemote.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulRemote.java
index a0d6cf2..c1507c1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulRemote.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.clientview.adapted;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface SfulRemote extends CommonRemote, EJBObject
{
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulRemoteHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulRemoteHome.java
index 9588494..17970ee 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulRemoteHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulRemoteHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.clientview.adapted;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface SfulRemoteHome extends EJBHome
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/Sless.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/Sless.java
index 6bb240a..e891701 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/Sless.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.clientview.adapted;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface Sless extends Common, EJBLocalObject
{}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SlessEJB.java
index 1c7de62..c04e8da 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SlessEJB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.clientview.adapted;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.Resource;
import javax.transaction.TransactionManager;
import javax.transaction.Status;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SlessHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SlessHome.java
index 0fffc14..909673c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SlessHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SlessHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.clientview.adapted;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface SlessHome extends EJBLocalHome
{
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SlessRemote.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SlessRemote.java
index cf8d7fd..4d6225f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SlessRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SlessRemote.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.clientview.adapted;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface SlessRemote extends CommonRemote, EJBObject
{}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SlessRemoteHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SlessRemoteHome.java
index 181ce6c..95bbd95 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SlessRemoteHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SlessRemoteHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.clientview.adapted;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface SlessRemoteHome extends EJBHome
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/client/Client.java
index f4d3538..414604d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/client/Client.java
@@ -19,7 +19,7 @@
import java.io.*;
import java.util.*;
import javax.naming.InitialContext;
-import javax.ejb.*;
+import jakarta.ejb.*;
import org.omg.CORBA.ORB;
import com.sun.s1asdev.ejb.ejb30.clientview.core.*;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
@@ -123,7 +123,7 @@
try {
h.throwAppException1();
throw new Exception("didn't get exception for testException2");
- } catch(javax.ejb.FinderException e) {
+ } catch(jakarta.ejb.FinderException e) {
System.out.println("Successfully caught exception " +
e.getClass() + " " + e.getMessage());
}
@@ -131,7 +131,7 @@
try {
h.throwAppException2();
throw new Exception("didn't get exception for testException3");
- } catch(javax.ejb.FinderException e) {
+ } catch(jakarta.ejb.FinderException e) {
System.out.println("Successfully caught exception " +
e.getClass() + " " + e.getMessage());
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/Bmp.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/Bmp.java
index 4b78c52..2108358 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/Bmp.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/Bmp.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.clientview.core;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface Bmp extends Common
{}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpEJB.java
index b03f582..db989ed 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpEJB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.clientview.core;
-import javax.ejb.*;
+import jakarta.ejb.*;
public class BmpEJB implements EntityBean
{
@@ -77,12 +77,12 @@
// throws some checked exception which is a subclass of the declared
// checked exception
- public void testException3() throws javax.ejb.FinderException {
+ public void testException3() throws jakarta.ejb.FinderException {
throw new ObjectNotFoundException("testException3");
}
// throws some checked exception
- public void testException4() throws javax.ejb.FinderException {
+ public void testException4() throws jakarta.ejb.FinderException {
throw new FinderException("testException4");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpHome.java
index d2258e5..244fe3e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.clientview.core;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface BmpHome extends BmpHomeSuper
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpHomeSuper.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpHomeSuper.java
index 5557c80..c36315e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpHomeSuper.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpHomeSuper.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.clientview.core;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface BmpHomeSuper extends EJBLocalHome
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpRemote.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpRemote.java
index 91f38cc..a47c638 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpRemote.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.clientview.core;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
public interface BmpRemote extends CommonRemote
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpRemoteHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpRemoteHome.java
index 9c7f337..a9c4baa 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpRemoteHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpRemoteHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.clientview.core;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
public interface BmpRemoteHome extends BmpRemoteHomeSuper
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpRemoteHomeSuper.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpRemoteHomeSuper.java
index 4507e9d..e94e1cf 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpRemoteHomeSuper.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpRemoteHomeSuper.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.clientview.core;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
public interface BmpRemoteHomeSuper extends EJBHome
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/Common.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/Common.java
index 6c78eb2..0e3364c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/Common.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/Common.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.clientview.core;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface Common extends EJBLocalObject
{
@@ -42,5 +42,5 @@
void testException2();
// throws some checked exception
- void testException3() throws javax.ejb.FinderException;
+ void testException3() throws jakarta.ejb.FinderException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/CommonRemote.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/CommonRemote.java
index 6e965bc..69853b2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/CommonRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/CommonRemote.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.clientview.core;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
public interface CommonRemote extends EJBObject
@@ -43,9 +43,9 @@
void testException2() throws RemoteException;
// throws some checked exception
- void testException3() throws javax.ejb.FinderException, RemoteException;
+ void testException3() throws jakarta.ejb.FinderException, RemoteException;
- void testException4() throws javax.ejb.FinderException, RemoteException;
+ void testException4() throws jakarta.ejb.FinderException, RemoteException;
void testPassByRef1(int a) throws RemoteException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/Hello.java
index be474af..894929c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/Hello.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.clientview.core;
-import javax.ejb.FinderException;
+import jakarta.ejb.FinderException;
// Remote business interface
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/HelloEJB.java
index 341fc94..457780f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/HelloEJB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.clientview.core;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import java.util.*;
import javax.rmi.PortableRemoteObject;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/Sful.java
index 6d077eb..4a9d3ad 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/Sful.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.clientview.core;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface Sful extends Common
{}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SfulEJB.java
index 6c6e98f..1520c06 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SfulEJB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.clientview.core;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.PostConstruct;
import jakarta.annotation.PreDestroy;
@@ -76,12 +76,12 @@
// throws some checked exception which is a subclass of the declared
// checked exception
- public void testException3() throws javax.ejb.FinderException {
+ public void testException3() throws jakarta.ejb.FinderException {
throw new ObjectNotFoundException("testException3");
}
// throws some checked exception
- public void testException4() throws javax.ejb.FinderException {
+ public void testException4() throws jakarta.ejb.FinderException {
throw new FinderException("testException4");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SfulHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SfulHome.java
index 8449eef..2c4e502 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SfulHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SfulHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.clientview.core;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface SfulHome extends EJBLocalHome
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SfulRemote.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SfulRemote.java
index 4a1d905..daa030f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SfulRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SfulRemote.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.clientview.core;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface SfulRemote extends CommonRemote
{}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SfulRemoteHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SfulRemoteHome.java
index 7e2a06a..a891073 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SfulRemoteHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SfulRemoteHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.clientview.core;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
public interface SfulRemoteHome extends EJBHome
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/Sless.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/Sless.java
index 2785c8c..7fe2f25 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/Sless.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.clientview.core;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface Sless extends Common
{}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SlessEJB.java
index 2d33a79..303abf5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SlessEJB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.clientview.core;
-import javax.ejb.*;
+import jakarta.ejb.*;
public class SlessEJB implements SessionBean
{
@@ -60,13 +60,13 @@
// throws some checked exception which is a subclass of the declared
// checked exception
- public void testException3() throws javax.ejb.FinderException {
+ public void testException3() throws jakarta.ejb.FinderException {
throw new ObjectNotFoundException("testException3");
}
// throws some checked exception
- public void testException4() throws javax.ejb.FinderException {
- throw new javax.ejb.FinderException("testException4");
+ public void testException4() throws jakarta.ejb.FinderException {
+ throw new jakarta.ejb.FinderException("testException4");
}
public void testPassByRef1(int a) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SlessHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SlessHome.java
index 90e1b94..f4e801b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SlessHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SlessHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.clientview.core;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface SlessHome extends EJBLocalHome
{
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SlessRemote.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SlessRemote.java
index 959a06f..e0ef1fb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SlessRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SlessRemote.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.clientview.core;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface SlessRemote extends CommonRemote
{}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SlessRemoteHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SlessRemoteHome.java
index be4ddab..9845cc1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SlessRemoteHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SlessRemoteHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.clientview.core;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
public interface SlessRemoteHome extends EJBHome
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/client/Client.java
index abcab55..a527d9e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/client/Client.java
@@ -18,7 +18,7 @@
import java.io.*;
import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
import javax.transaction.TransactionRequiredException;
import com.sun.s1asdev.ejb.ejb30.clientview.exceptions.*;
@@ -138,7 +138,7 @@
sleepFor(5);
sfulRemoteBusiness.ping();
stat.addStatus("local concurrentAccess[1.1]", stat.FAIL);
- } catch (javax.ejb.ConcurrentAccessException conEx) {
+ } catch (jakarta.ejb.ConcurrentAccessException conEx) {
stat.addStatus("local concurrentAccess[1.1]", stat.PASS);
} catch (Throwable th) {
System.out.println("Argggggg: Got: " + th);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/Hello.java
index d2d9d8b..77c558d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/Hello.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.clientview.exceptions;
-import javax.ejb.FinderException;
+import jakarta.ejb.FinderException;
// Remote business interface
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/HelloEJB.java
index 8cf924e..752648a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/HelloEJB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.clientview.exceptions;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import java.util.*;
import javax.rmi.PortableRemoteObject;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/RollbackAppException.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/RollbackAppException.java
index 18ece9a..a7d0d6b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/RollbackAppException.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/RollbackAppException.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.clientview.exceptions;
-import javax.ejb.ApplicationException;
+import jakarta.ejb.ApplicationException;
@ApplicationException(rollback=true)
public class RollbackAppException extends RuntimeException
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/RuntimeAppException.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/RuntimeAppException.java
index 52eb30d..92b4956 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/RuntimeAppException.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/RuntimeAppException.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.clientview.exceptions;
-import javax.ejb.ApplicationException;
+import jakarta.ejb.ApplicationException;
@ApplicationException
public class RuntimeAppException extends RuntimeException
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SfulBusiness.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SfulBusiness.java
index 000451b..1ed2020 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SfulBusiness.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SfulBusiness.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.clientview.exceptions;
-import javax.ejb.Local;
+import jakarta.ejb.Local;
@Local
public interface SfulBusiness
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SfulEJB.java
index 25cf9f0..38f6354 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SfulEJB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.clientview.exceptions;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.Resource;
import jakarta.annotation.PreDestroy;
import jakarta.annotation.security.DenyAll;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SfulRemoteBusiness.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SfulRemoteBusiness.java
index db414c5..6c32446 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SfulRemoteBusiness.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SfulRemoteBusiness.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.clientview.exceptions;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface SfulRemoteBusiness
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SfulRemoteBusiness2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SfulRemoteBusiness2.java
index d010fef..ec478c6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SfulRemoteBusiness2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SfulRemoteBusiness2.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.clientview.exceptions;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
import java.rmi.RemoteException;
@Remote
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SlessEJB.java
index b407160..f221785 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SlessEJB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.clientview.exceptions;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.Resource;
import jakarta.annotation.security.DenyAll;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SlessRemoteBusiness.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SlessRemoteBusiness.java
index 0461dc4..6dadb35 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SlessRemoteBusiness.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SlessRemoteBusiness.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb.ejb30.clientview.exceptions;
// Remote business interface
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface SlessRemoteBusiness
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SlessRemoteBusiness2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SlessRemoteBusiness2.java
index 49b6647..fd9b7f1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SlessRemoteBusiness2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SlessRemoteBusiness2.java
@@ -18,7 +18,7 @@
// Remote business interface
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
import java.rmi.RemoteException;
@Remote
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/client/Client.java
index 4374619..6e258c4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/client/Client.java
@@ -18,7 +18,7 @@
import java.io.*;
import java.util.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import javax.naming.InitialContext;
import com.sun.s1asdev.ejb.ejb30.ee.local_sfsb.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/Sful.java
index 08d6aa4..d67e10c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/Sful.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.ee.local_sfsb;
-import javax.ejb.Local;
+import jakarta.ejb.Local;
@Local
public interface Sful
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/SfulDriver.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/SfulDriver.java
index 0cefe2d..3ed52c2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/SfulDriver.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/SfulDriver.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.ee.local_sfsb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface SfulDriver {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/SfulDriverEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/SfulDriverEJB.java
index 5de200b..069647e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/SfulDriverEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/SfulDriverEJB.java
@@ -16,11 +16,11 @@
package com.sun.s1asdev.ejb.ejb30.ee.local_sfsb;
-import javax.ejb.EJB;
-import javax.ejb.Stateful;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateful;
import javax.naming.InitialContext;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
@Stateful(mappedName="AAbbCCejb/SfulLocalRemoteRef")
@EJB(name="ejb/Sful", beanInterface=Sful.class)
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/SfulEJB.java
index 2db6361..c0649cb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/SfulEJB.java
@@ -16,9 +16,9 @@
package com.sun.s1asdev.ejb.ejb30.ee.local_sfsb;
-import javax.ejb.Stateful;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
@Stateful
public class SfulEJB
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/SfulGreeter.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/SfulGreeter.java
index 9393888..beeeefc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/SfulGreeter.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/SfulGreeter.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.ee.local_sfsb;
-import javax.ejb.Local;
+import jakarta.ejb.Local;
@Local
public interface SfulGreeter
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/client/Client.java
index ea4d23f..b5d0211 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/client/Client.java
@@ -18,7 +18,7 @@
import java.io.*;
import java.util.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import javax.naming.InitialContext;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/ejb/SfulDriver.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/ejb/SfulDriver.java
index 0f8c053..a0954df 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/ejb/SfulDriver.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/ejb/SfulDriver.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.ee.remote_sfsb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface SfulDriver {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/ejb/SfulProxy.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/ejb/SfulProxy.java
index a0a8616..2e3f443 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/ejb/SfulProxy.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/ejb/SfulProxy.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.ee.remote_client;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface SfulProxy {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/ejb/SfulProxyEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/ejb/SfulProxyEJB.java
index 987109c..ae40678 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/ejb/SfulProxyEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/ejb/SfulProxyEJB.java
@@ -16,8 +16,8 @@
package com.sun.s1asdev.ejb.ejb30.ee.remote_client;
-import javax.ejb.Stateful;
-import javax.ejb.EJB;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.EJB;
import javax.naming.InitialContext;
import com.sun.s1asdev.ejb.ejb30.ee.remote_sfsb.SfulDriver;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/client/Client.java
index a54ae1c..e28c97f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/client/Client.java
@@ -19,7 +19,7 @@
import java.io.*;
import java.util.*;
import java.net.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import javax.naming.InitialContext;
import com.sun.s1asdev.ejb.ejb30.ee.remote_sfsb.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/RemoteSful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/RemoteSful.java
index 66076f9..b150800 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/RemoteSful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/RemoteSful.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.ee.remote_sfsb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface RemoteSful
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/RemoteSfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/RemoteSfulEJB.java
index f5b3a99..47fa04c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/RemoteSfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/RemoteSfulEJB.java
@@ -16,9 +16,9 @@
package com.sun.s1asdev.ejb.ejb30.ee.remote_sfsb;
-import javax.ejb.Stateful;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
@Stateful
public class RemoteSfulEJB
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/SfulDriver.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/SfulDriver.java
index 0f8c053..a0954df 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/SfulDriver.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/SfulDriver.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.ee.remote_sfsb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface SfulDriver {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/SfulDriverEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/SfulDriverEJB.java
index 00d43d4..e5c4c90 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/SfulDriverEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/SfulDriverEJB.java
@@ -16,12 +16,12 @@
package com.sun.s1asdev.ejb.ejb30.ee.remote_sfsb;
-import javax.ejb.EJB;
-import javax.ejb.EJBs;
-import javax.ejb.Stateful;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBs;
+import jakarta.ejb.Stateful;
import javax.naming.InitialContext;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
@Stateful(mappedName="jndi_SfulDriver")
@EJBs({
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/SfulFacade.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/SfulFacade.java
index 5d50986..7c28509 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/SfulFacade.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/SfulFacade.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.ee.remote_sfsb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface SfulFacade {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/client/Client.java
index 124e4aa..6ee11e7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/client/Client.java
@@ -18,8 +18,8 @@
import java.io.*;
import java.util.*;
-import javax.ejb.EJB;
-import javax.ejb.Handle;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Handle;
import com.sun.s1asdev.ejb.ejb30.hello.dcode.*;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/ejb/Sful.java
index 84decc3..5a6a2d8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/ejb/Sful.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.hello.dcode;
-public interface Sful extends javax.ejb.EJBObject
+public interface Sful extends jakarta.ejb.EJBObject
{
public String hello() throws java.rmi.RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/ejb/SfulEJB.java
index 54252ad..c02a3c3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/ejb/SfulEJB.java
@@ -16,11 +16,11 @@
package com.sun.s1asdev.ejb.ejb30.hello.dcode;
-import javax.ejb.Stateful;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
-import javax.ejb.Init;
-import javax.ejb.RemoteHome;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.Init;
+import jakarta.ejb.RemoteHome;
@RemoteHome(SfulHome.class)
@Stateful
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/ejb/SfulHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/ejb/SfulHome.java
index 2ea5b7f..c80fcd7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/ejb/SfulHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/ejb/SfulHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.hello.dcode;
-public interface SfulHome extends javax.ejb.EJBHome
+public interface SfulHome extends jakarta.ejb.EJBHome
{
- public Sful create() throws javax.ejb.CreateException, java.rmi.RemoteException;
+ public Sful create() throws jakarta.ejb.CreateException, java.rmi.RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/ejb/Sless.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/ejb/Sless.java
index 5997572..325c0cc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/ejb/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/ejb/Sless.java
@@ -22,7 +22,7 @@
{
public String hello();
- public String hello2() throws javax.ejb.CreateException;
+ public String hello2() throws jakarta.ejb.CreateException;
public String getId();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/ejb/SlessRemote.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/ejb/SlessRemote.java
index 2dc2050..35e3051 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/ejb/SlessRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/ejb/SlessRemote.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.hello.session2;
-public interface SlessRemote extends javax.ejb.EJBObject
+public interface SlessRemote extends jakarta.ejb.EJBObject
{
public String hello() throws java.rmi.RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/ejb/SlessRemoteHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/ejb/SlessRemoteHome.java
index 723e5b5..93c1efd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/ejb/SlessRemoteHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/ejb/SlessRemoteHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.hello.session2;
-public interface SlessRemoteHome extends javax.ejb.EJBHome
+public interface SlessRemoteHome extends jakarta.ejb.EJBHome
{
- public SlessRemote create() throws javax.ejb.CreateException, java.rmi.RemoteException;
+ public SlessRemote create() throws jakarta.ejb.CreateException, java.rmi.RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/client/Client.java
index d5f8a6d..bad36a1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/client/Client.java
@@ -18,7 +18,7 @@
import java.io.*;
import java.util.*;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
import jakarta.jms.*;
import jakarta.annotation.Resource;
import javax.naming.InitialContext;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/HelloStateful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/HelloStateful.java
index 0da02f9..144ea80 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/HelloStateful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/HelloStateful.java
@@ -16,8 +16,8 @@
package com.sun.s1asdev.ejb.ejb30.hello.mdb;
-import javax.ejb.Stateful;
-import javax.ejb.Remove;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.Remove;
import jakarta.annotation.PreDestroy;
// Hello1 interface is not annotated with @Local. If the
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/HelloStateless.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/HelloStateless.java
index 8f91a35..cf45901 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/HelloStateless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/HelloStateless.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.hello.mdb;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
// Hello1 interface is not annotated with @Local. If the
// bean only implements one interface it is assumed to be
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/MessageBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/MessageBean.java
index ddd4c47..75a6c3d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/MessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/MessageBean.java
@@ -16,13 +16,13 @@
package com.sun.s1asdev.ejb.ejb30.hello.mdb;
-import javax.ejb.MessageDriven;
-import javax.ejb.EJBException;
-import javax.ejb.NoSuchEJBException;
-import javax.ejb.EJB;
-import javax.ejb.TransactionManagement;
-import javax.ejb.TransactionManagementType;
-import javax.ejb.ActivationConfigProperty;
+import jakarta.ejb.MessageDriven;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.NoSuchEJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.TransactionManagement;
+import jakarta.ejb.TransactionManagementType;
+import jakarta.ejb.ActivationConfigProperty;
import jakarta.jms.MessageListener;
import jakarta.jms.Message;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/HelloStateful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/HelloStateful.java
index ede2602..7afd2b7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/HelloStateful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/HelloStateful.java
@@ -16,16 +16,16 @@
package com.sun.s1asdev.ejb.ejb30.hello.mdb2;
-import javax.ejb.Stateful;
-import javax.ejb.Local;
-import javax.ejb.Remove;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.Local;
+import jakarta.ejb.Remove;
import jakarta.annotation.PreDestroy;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJBException;
import javax.naming.InitialContext;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionContext;
@Local({Hello2.class})
-@Stateful public class HelloStateful implements Hello2, javax.ejb.SessionBean {
+@Stateful public class HelloStateful implements Hello2, jakarta.ejb.SessionBean {
private String msg;
@@ -44,7 +44,7 @@
}
*/
- public void setSessionContext(javax.ejb.SessionContext sc) {
+ public void setSessionContext(jakarta.ejb.SessionContext sc) {
System.out.println("In HelloStateful:setSessionContext");
try {
SessionContext sc2 = (SessionContext)
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/HelloStateless.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/HelloStateless.java
index baccc45..c1b8391 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/HelloStateless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/HelloStateless.java
@@ -16,12 +16,12 @@
package com.sun.s1asdev.ejb.ejb30.hello.mdb2;
-import javax.ejb.Stateless;
-import javax.ejb.TimerService;
-import javax.ejb.Local;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.TimerService;
+import jakarta.ejb.Local;
import jakarta.annotation.PostConstruct;
import jakarta.annotation.Resource;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJBException;
@Local({Hello1.class})
@Stateless public class HelloStateless extends HelloStatelessSuper implements Hello1 {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/HelloStatelessSuper.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/HelloStatelessSuper.java
index 5f5c3c1..0493b03 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/HelloStatelessSuper.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/HelloStatelessSuper.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.hello.mdb2;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.transaction.TransactionManager;
import javax.transaction.Status;
import javax.naming.InitialContext;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/MessageBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/MessageBean.java
index a593f05..aec028a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/MessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/MessageBean.java
@@ -16,18 +16,18 @@
package com.sun.s1asdev.ejb.ejb30.hello.mdb2;
-import javax.ejb.MessageDriven;
-import javax.ejb.Timeout;
-import javax.ejb.Timer;
-import javax.ejb.TimerService;
-import javax.ejb.EJBException;
-import javax.ejb.NoSuchEJBException;
-import javax.ejb.EJB;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.MessageDriven;
+import jakarta.ejb.Timeout;
+import jakarta.ejb.Timer;
+import jakarta.ejb.TimerService;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.NoSuchEJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
import javax.interceptor.AroundInvoke;
import javax.interceptor.InvocationContext;
-import javax.ejb.MessageDrivenContext;
+import jakarta.ejb.MessageDrivenContext;
import javax.naming.InitialContext;
@@ -48,7 +48,7 @@
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
@MessageDriven(messageListenerInterface=MessageListener.class)
-public class MessageBean implements javax.ejb.MessageDrivenBean {
+public class MessageBean implements jakarta.ejb.MessageDrivenBean {
@EJB(name="hello1") private Hello1 hello1;
@EJB private Hello2 hello2;
@@ -56,8 +56,8 @@
boolean onMessageInterceptorCalled = false;
boolean timeoutInterceptorCalled = false;
- @Resource javax.ejb.MessageDrivenContext ctx;
- @Resource javax.ejb.TimerService injectedTimerService;
+ @Resource jakarta.ejb.MessageDrivenContext ctx;
+ @Resource jakarta.ejb.TimerService injectedTimerService;
@Resource(name="jms/MyQueueConnectionFactory")
QueueConnectionFactory qcFactory;
@@ -94,7 +94,7 @@
}
@Resource
- private void setMDC(javax.ejb.MessageDrivenContext context) {
+ private void setMDC(jakarta.ejb.MessageDrivenContext context) {
try {
context.getTimerService();
@@ -107,7 +107,7 @@
}
- public void setMessageDrivenContext(javax.ejb.MessageDrivenContext mdc) {
+ public void setMessageDrivenContext(jakarta.ejb.MessageDrivenContext mdc) {
System.out.println("In MDB:setMessageDrivenContext");
}
@@ -220,7 +220,7 @@
}
- @Timeout private void timeout(javax.ejb.Timer t) {
+ @Timeout private void timeout(jakarta.ejb.Timer t) {
QueueConnection connection = null;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/client/Client.java
index deb56bc..ff4ad8f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/client/Client.java
@@ -16,7 +16,7 @@
import java.io.*;
import java.util.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
public class Client {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/ejb/Sful.java
index 0c7a132..2c4073c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/ejb/Sful.java
@@ -14,7 +14,7 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface Sful
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/ejb/SfulEJB.java
index 157b1b0..d55a0ed 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/ejb/SfulEJB.java
@@ -14,7 +14,7 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
@Stateful
public class SfulEJB implements Sful
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/ejb/Sless.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/ejb/Sless.java
index 6341516..0f1e8f9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/ejb/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/ejb/Sless.java
@@ -14,7 +14,7 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface Sless
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/ejb/SlessEJB.java
index 3f3d333..98eef03 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/ejb/SlessEJB.java
@@ -14,7 +14,7 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
@Stateless
public class SlessEJB implements Sless
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/client/Client.java
index 9f89212..410c711 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/client/Client.java
@@ -18,7 +18,7 @@
import java.io.*;
import java.util.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import javax.naming.InitialContext;
import com.sun.s1asdev.ejb.ejb30.hello.session.*;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/ejb/Sful.java
index 896d72f..80af5ba 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/ejb/Sful.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.hello.session;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface Sful
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/ejb/SfulEJB.java
index acb4650..d3599e3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/ejb/SfulEJB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.hello.session;
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
@Stateful
public class SfulEJB implements Sful
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/ejb/Sless.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/ejb/Sless.java
index 3f23982..848e2ba 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/ejb/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/ejb/Sless.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.hello.session;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface Sless
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/ejb/SlessEJB.java
index 2d0d0b5..a0e0f33 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/ejb/SlessEJB.java
@@ -16,13 +16,13 @@
package com.sun.s1asdev.ejb.ejb30.hello.session;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
@Stateless
public class SlessEJB implements Sless
{
- @jakarta.annotation.Resource javax.ejb.TimerService ts;
+ @jakarta.annotation.Resource jakarta.ejb.TimerService ts;
public String hello() {
System.out.println("In SlessEJB:hello()");
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/client/Client.java
index 20991b5..e556394 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/client/Client.java
@@ -18,11 +18,11 @@
import java.io.*;
import java.util.*;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
-import javax.ejb.EJBs;
-import javax.ejb.NoSuchEJBException;
-import javax.ejb.EJBTransactionRequiredException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.EJBs;
+import jakarta.ejb.NoSuchEJBException;
+import jakarta.ejb.EJBTransactionRequiredException;
import javax.naming.InitialContext;
import javax.naming.Context;
import com.sun.s1asdev.ejb.ejb30.hello.session2.*;
@@ -225,7 +225,7 @@
try {
sless1.hello2();
throw new Exception("Did not receive CreateException");
- } catch(javax.ejb.CreateException ce) {
+ } catch(jakarta.ejb.CreateException ce) {
System.out.println("Successfully caught app exception");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/client/ClientSuper.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/client/ClientSuper.java
index d728a3b..adaaf7f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/client/ClientSuper.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/client/ClientSuper.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.hello.session2.client;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import com.sun.s1asdev.ejb.ejb30.hello.session2.*;
public class ClientSuper {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/Foo.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/Foo.java
index 68bba90..d89469d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/Foo.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/Foo.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.hello.session2;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.Remote;
import java.rmi.RemoteException;
import java.io.Serializable;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/FooHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/FooHome.java
index e90831c..587c29d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/FooHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/FooHome.java
@@ -19,8 +19,8 @@
import java.io.Serializable;
import java.rmi.Remote;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface FooHome extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/MyCallbackHandler.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/MyCallbackHandler.java
index e6c1984..29fe7ca 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/MyCallbackHandler.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/MyCallbackHandler.java
@@ -18,7 +18,7 @@
import jakarta.annotation.PreDestroy;
import javax.interceptor.InvocationContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJBException;
public class MyCallbackHandler {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/Sful2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/Sful2.java
index 35e7471..a42c24c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/Sful2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/Sful2.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.hello.session2;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface Sful2
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SfulEJB.java
index 9f6a436..da9d18c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SfulEJB.java
@@ -16,18 +16,18 @@
package com.sun.s1asdev.ejb.ejb30.hello.session2;
-import javax.ejb.Stateful;
-import javax.ejb.Remote;
-import javax.ejb.EJB;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.Remote;
+import jakarta.ejb.EJB;
import jakarta.annotation.PostConstruct;
import javax.interceptor.Interceptors;
-import javax.ejb.EJBs;
-import javax.ejb.Remove;
+import jakarta.ejb.EJBs;
+import jakarta.ejb.Remove;
import jakarta.annotation.PreDestroy;
-import javax.ejb.EJBException;
-import javax.ejb.SessionContext;
-import javax.ejb.TransactionManagement;
-import javax.ejb.TransactionManagementType;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.TransactionManagement;
+import jakarta.ejb.TransactionManagementType;
import javax.naming.InitialContext;
import jakarta.annotation.Resource;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SfulEJB2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SfulEJB2.java
index d368bb9..0b431e0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SfulEJB2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SfulEJB2.java
@@ -16,19 +16,19 @@
package com.sun.s1asdev.ejb.ejb30.hello.session2;
-import javax.ejb.Stateful;
-import javax.ejb.Remote;
-import javax.ejb.EJB;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.Remote;
+import jakarta.ejb.EJB;
import jakarta.annotation.PostConstruct;
import javax.interceptor.Interceptors;
-import javax.ejb.EJBs;
-import javax.ejb.Remove;
-import javax.ejb.SessionSynchronization;
+import jakarta.ejb.EJBs;
+import jakarta.ejb.Remove;
+import jakarta.ejb.SessionSynchronization;
import jakarta.annotation.PreDestroy;
-import javax.ejb.EJBException;
-import javax.ejb.SessionContext;
-import javax.ejb.TransactionManagement;
-import javax.ejb.TransactionManagementType;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.TransactionManagement;
+import jakarta.ejb.TransactionManagementType;
import javax.naming.InitialContext;
import jakarta.annotation.Resource;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/Sless.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/Sless.java
index 5997572..325c0cc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/Sless.java
@@ -22,7 +22,7 @@
{
public String hello();
- public String hello2() throws javax.ejb.CreateException;
+ public String hello2() throws jakarta.ejb.CreateException;
public String getId();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessEJB.java
index 7c4a4dd..21c699c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessEJB.java
@@ -16,14 +16,14 @@
package com.sun.s1asdev.ejb.ejb30.hello.session2;
-import javax.ejb.Stateless;
-import javax.ejb.Remote;
-import javax.ejb.SessionContext;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.Remote;
+import jakarta.ejb.SessionContext;
import jakarta.annotation.Resource;
-import javax.ejb.EJB;
-import javax.ejb.RemoteHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.RemoteHome;
+import jakarta.ejb.CreateException;
import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
@@ -51,8 +51,8 @@
return "hello from SlessEJB";
}
- public String hello2() throws javax.ejb.CreateException {
- throw new javax.ejb.CreateException();
+ public String hello2() throws jakarta.ejb.CreateException {
+ throw new jakarta.ejb.CreateException();
}
public String getId() {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessEJB2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessEJB2.java
index 8b01cd2..4a85608 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessEJB2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessEJB2.java
@@ -16,15 +16,15 @@
package com.sun.s1asdev.ejb.ejb30.hello.session2;
-import javax.ejb.Stateless;
-import javax.ejb.Remote;
-import javax.ejb.EJBException;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.Remote;
+import jakarta.ejb.EJBException;
import jakarta.annotation.PostConstruct;
-import javax.ejb.SessionBean;
-import javax.ejb.CreateException;
-import javax.ejb.SessionContext;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
import javax.naming.InitialContext;
import javax.transaction.TransactionManager;
@@ -64,8 +64,8 @@
return "hello from SlessEJB2";
}
- public String hello2() throws javax.ejb.CreateException {
- throw new javax.ejb.CreateException();
+ public String hello2() throws jakarta.ejb.CreateException {
+ throw new jakarta.ejb.CreateException();
}
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessEJB3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessEJB3.java
index 098a718..09811f3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessEJB3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessEJB3.java
@@ -16,12 +16,12 @@
package com.sun.s1asdev.ejb.ejb30.hello.session2;
-import javax.ejb.Stateless;
-import javax.ejb.Remote;
-import javax.ejb.EJB;
-import javax.ejb.EJBContext;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.Remote;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBContext;
import jakarta.annotation.PostConstruct;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionContext;
import jakarta.annotation.Resource;
import java.util.Collection;
@@ -39,7 +39,7 @@
private @Resource SessionContext ejbContext2;
- @Resource(type=javax.ejb.SessionContext.class)
+ @Resource(type=jakarta.ejb.SessionContext.class)
private EJBContext ejbContext3;
private EJBContext ejbContext4;
@@ -74,7 +74,7 @@
}
private EJBContext ejbContext6;
- @Resource(type=javax.ejb.SessionContext.class)
+ @Resource(type=jakarta.ejb.SessionContext.class)
private void setEJBContext6(EJBContext context) {
ejbContext6 = context;
}
@@ -101,8 +101,8 @@
return "hello from sless ejb3";
}
- public String hello2() throws javax.ejb.CreateException {
- throw new javax.ejb.CreateException();
+ public String hello2() throws jakarta.ejb.CreateException {
+ throw new jakarta.ejb.CreateException();
}
public String hello3() {
@@ -119,7 +119,7 @@
if( get1.equals(get2) ) {
System.out.println("get1 =" + get1);
System.out.println("get2 =" + get2);
- throw new javax.ejb.EJBException("SFSB get test failed");
+ throw new jakarta.ejb.EJBException("SFSB get test failed");
}
return "hello3()";
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessRemote.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessRemote.java
index 2dc2050..35e3051 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessRemote.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.hello.session2;
-public interface SlessRemote extends javax.ejb.EJBObject
+public interface SlessRemote extends jakarta.ejb.EJBObject
{
public String hello() throws java.rmi.RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessRemoteHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessRemoteHome.java
index 723e5b5..93c1efd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessRemoteHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessRemoteHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.hello.session2;
-public interface SlessRemoteHome extends javax.ejb.EJBHome
+public interface SlessRemoteHome extends jakarta.ejb.EJBHome
{
- public SlessRemote create() throws javax.ejb.CreateException, java.rmi.RemoteException;
+ public SlessRemote create() throws jakarta.ejb.CreateException, java.rmi.RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/client/Client.java
index 0e729bb..2e687b2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/client/Client.java
@@ -18,7 +18,7 @@
import java.io.*;
import java.util.*;
-import javax.ejb.NoSuchEJBException;
+import jakarta.ejb.NoSuchEJBException;
import javax.naming.InitialContext;
import javax.naming.Context;
import com.sun.s1asdev.ejb.ejb30.hello.session2full.*;
@@ -185,7 +185,7 @@
try {
sless1.hello2();
throw new Exception("Did not receive CreateException");
- } catch(javax.ejb.CreateException ce) {
+ } catch(jakarta.ejb.CreateException ce) {
System.out.println("Successfully caught app exception");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/Foo.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/Foo.java
index d8b67cc..6218d31 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/Foo.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/Foo.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.hello.session2full;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.Remote;
import java.rmi.RemoteException;
import java.io.Serializable;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/FooHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/FooHome.java
index 0712ddb..5115563 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/FooHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/FooHome.java
@@ -19,8 +19,8 @@
import java.io.Serializable;
import java.rmi.Remote;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface FooHome extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SfulEJB.java
index 5c4aedf..5b5f352 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SfulEJB.java
@@ -16,8 +16,8 @@
package com.sun.s1asdev.ejb.ejb30.hello.session2full;
-import javax.ejb.EJBException;
-import javax.ejb.SessionContext;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.SessionContext;
import javax.naming.InitialContext;
import javax.transaction.UserTransaction;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/Sless.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/Sless.java
index a6c1801..0eda3da 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/Sless.java
@@ -22,7 +22,7 @@
{
public String hello();
- public String hello2() throws javax.ejb.CreateException;
+ public String hello2() throws jakarta.ejb.CreateException;
public String getId();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SlessEJB.java
index 8dfb837..26c8c37 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SlessEJB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.hello.session2full;
-import javax.ejb.CreateException;
+import jakarta.ejb.CreateException;
import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
@@ -31,8 +31,8 @@
return "hello from SlessEJB";
}
- public String hello2() throws javax.ejb.CreateException {
- throw new javax.ejb.CreateException();
+ public String hello2() throws jakarta.ejb.CreateException {
+ throw new jakarta.ejb.CreateException();
}
public String getId() {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SlessEJB2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SlessEJB2.java
index e455b87..3811751 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SlessEJB2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SlessEJB2.java
@@ -16,10 +16,10 @@
package com.sun.s1asdev.ejb.ejb30.hello.session2full;
-import javax.ejb.EJBException;
-import javax.ejb.SessionBean;
-import javax.ejb.CreateException;
-import javax.ejb.SessionContext;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.SessionContext;
import javax.naming.InitialContext;
import javax.transaction.TransactionManager;
@@ -46,8 +46,8 @@
return "hello from SlessEJB2";
}
- public String hello2() throws javax.ejb.CreateException {
- throw new javax.ejb.CreateException();
+ public String hello2() throws jakarta.ejb.CreateException {
+ throw new jakarta.ejb.CreateException();
}
public String getId() {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SlessEJB3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SlessEJB3.java
index 6a11cc1..5bc4362 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SlessEJB3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SlessEJB3.java
@@ -16,8 +16,8 @@
package com.sun.s1asdev.ejb.ejb30.hello.session2full;
-import javax.ejb.EJBContext;
-import javax.ejb.SessionContext;
+import jakarta.ejb.EJBContext;
+import jakarta.ejb.SessionContext;
import java.util.Collection;
import java.util.Iterator;
@@ -62,8 +62,8 @@
return "hello from sless ejb3";
}
- public String hello2() throws javax.ejb.CreateException {
- throw new javax.ejb.CreateException();
+ public String hello2() throws jakarta.ejb.CreateException {
+ throw new jakarta.ejb.CreateException();
}
public String hello3() {
@@ -80,7 +80,7 @@
if( get1.equals(get2) ) {
System.out.println("get1 =" + get1);
System.out.println("get2 =" + get2);
- throw new javax.ejb.EJBException("SFSB get test failed");
+ throw new jakarta.ejb.EJBException("SFSB get test failed");
}
return "hello3()";
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/ejb/HelloEJB.java
index 7dcc554..0ac9fe6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/ejb/HelloEJB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.hello.session3;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import javax.persistence.EntityManagerFactory;
import javax.persistence.PersistenceUnit;
@@ -61,13 +61,13 @@
ic.lookup("java:comp/env/myem");
} catch(Exception e) {
- throw new javax.ejb.EJBException(e);
+ throw new jakarta.ejb.EJBException(e);
}
System.out.println("HelloEJB successful injection of EMF/EM references!");
} else {
- throw new javax.ejb.EJBException("One or more EMF/EM references" +
+ throw new jakarta.ejb.EJBException("One or more EMF/EM references" +
" was not injected in HelloEJB");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/ejb/HelloStatefulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/ejb/HelloStatefulEJB.java
index 07b3756..e2d34ba 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/ejb/HelloStatefulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/ejb/HelloStatefulEJB.java
@@ -16,8 +16,8 @@
package com.sun.s1asdev.ejb.ejb30.hello.session3;
-import javax.ejb.Stateful;
-import javax.ejb.AccessTimeout;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.AccessTimeout;
import jakarta.annotation.PostConstruct;
import javax.persistence.PersistenceContext;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/servlet/Servlet.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/servlet/Servlet.java
index 7b0fc79..a82863b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/servlet/Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/servlet/Servlet.java
@@ -22,9 +22,9 @@
import javax.servlet.http.*;
import javax.naming.*;
import javax.rmi.PortableRemoteObject;
-import javax.ejb.EJB;
-import javax.ejb.EJBs;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBs;
+import jakarta.ejb.EJBException;
import jakarta.annotation.Resource;
import jakarta.annotation.Resources;
import javax.sql.DataSource;
@@ -201,7 +201,7 @@
sleepFor(10);
helloStateful2.ping();
throw new EJBException("Did not get ConcurrentAccessException");
- } catch (javax.ejb.ConcurrentAccessException conEx) {
+ } catch (jakarta.ejb.ConcurrentAccessException conEx) {
System.out.println("Got expected ConcurrentAccessException"); //Everything is fine
} catch (Throwable th) {
throw new EJBException("Got some wierd exception: " + th);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/client/Client.java
index 8e88c4c..f8720f7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/client/Client.java
@@ -19,7 +19,7 @@
import java.io.*;
import java.util.*;
import javax.naming.InitialContext;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import com.sun.s1asdev.ejb.ejb30.hello.session4.*;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/ejb/Sful.java
index 112764e..26440ec 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/ejb/Sful.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.hello.session4;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface Sful
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/ejb/Sful2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/ejb/Sful2.java
index ebef907..f47f50c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/ejb/Sful2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/ejb/Sful2.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.hello.session4;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface Sful2
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/ejb/SfulEJB.java
index 5b5e53f..37493fe 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/ejb/SfulEJB.java
@@ -16,8 +16,8 @@
package com.sun.s1asdev.ejb.ejb30.hello.session4;
-import javax.ejb.Stateful;
-import javax.ejb.SessionContext;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.SessionContext;
import jakarta.annotation.Resource;
@Stateful(mappedName="ejb_ejb30_hello_session4_Sful")
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/ejb/SlessEJB.java
index 5377da1..29f0c73 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/ejb/SlessEJB.java
@@ -16,8 +16,8 @@
package com.sun.s1asdev.ejb.ejb30.hello.session4;
-import javax.ejb.Stateless;
-import javax.ejb.Remote;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.Remote;
// Use @Remote without parameters. If there's only one ambiguous
// interface in implements clause, it will be treate as @Remote instead of
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/client/Client.java
index c6fd110..9cd7fa2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/client/Client.java
@@ -18,7 +18,7 @@
import java.io.*;
import java.util.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import com.sun.s1asdev.ejb.ejb30.hello.session5.Sful2;
import com.sun.s1asdev.ejb.ejb30.hello.session5.Sless2;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/ejb/SfulEJB.java
index 300f61e..9252fc3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/ejb/SfulEJB.java
@@ -16,10 +16,10 @@
package com.sun.s1asdev.ejb.ejb30.hello.session5;
-import javax.ejb.Stateful;
-import javax.ejb.Remote;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.Remote;
import javax.interceptor.Interceptors;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJBException;
@Stateful
@Remote({Sful.class, Sful2.class})
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/ejb/SlessEJB.java
index ce2f7f5..bc5cfe2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/ejb/SlessEJB.java
@@ -16,8 +16,8 @@
package com.sun.s1asdev.ejb.ejb30.hello.session5;
-import javax.ejb.Stateless;
-import javax.ejb.Remote;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.Remote;
@Stateless(mappedName="ejb_ejb30_hello_session5_Sless")
@Remote({Sless.class, Sless2.class})
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session_standalone/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session_standalone/client/Client.java
index 3d531da..ef1eb88 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session_standalone/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session_standalone/client/Client.java
@@ -18,7 +18,7 @@
import java.io.*;
import java.util.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import com.sun.s1asdev.ejb.ejb30.hello.session_standalone.*;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session_standalone/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session_standalone/ejb/SfulEJB.java
index 6e00a15..e70a97c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session_standalone/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session_standalone/ejb/SfulEJB.java
@@ -16,8 +16,8 @@
package com.sun.s1asdev.ejb.ejb30.hello.session_standalone;
-import javax.ejb.Stateful;
-import javax.ejb.Remote;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.Remote;
@Stateful
@Remote({Sful.class})
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session_standalone/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session_standalone/ejb/SlessEJB.java
index d820759..24adcc2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session_standalone/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session_standalone/ejb/SlessEJB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.hello.session_standalone;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.Resource;
@Stateless
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/client/Client.java
index cd418c3..33fa70a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/client/Client.java
@@ -18,7 +18,7 @@
import java.io.*;
import java.util.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import com.sun.s1asdev.ejb.ejb30.interceptors.bindings.*;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Common.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Common.java
index 79f1061..f9dd39e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Common.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Common.java
@@ -20,7 +20,7 @@
import java.util.LinkedList;
import javax.interceptor.InvocationContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJBException;
public class Common {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorA.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorA.java
index 64723e6..e53f28f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorA.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorA.java
@@ -20,7 +20,7 @@
import javax.interceptor.InvocationContext;
import jakarta.annotation.PostConstruct;
import javax.naming.InitialContext;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionContext;
import jakarta.annotation.Resource;
public class InterceptorA {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sful.java
index 3fe665d..42b3e1a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sful.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.interceptors.bindings;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface Sful
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sful2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sful2.java
index f66344c..3a12684 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sful2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sful2.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.interceptors.bindings;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface Sful2
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SfulEJB.java
index c634356..aac4548 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SfulEJB.java
@@ -17,13 +17,13 @@
package com.sun.s1asdev.ejb.ejb30.interceptors.bindings;
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
import javax.interceptor.Interceptors;
import javax.interceptor.ExcludeDefaultInterceptors;
import javax.interceptor.ExcludeClassInterceptors;
import javax.interceptor.AroundInvoke;
import javax.interceptor.InvocationContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJBException;
@Stateful
@Interceptors({InterceptorC.class, InterceptorD.class})
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SfulEJB2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SfulEJB2.java
index 948b7a7..45b3a10 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SfulEJB2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SfulEJB2.java
@@ -16,9 +16,9 @@
package com.sun.s1asdev.ejb.ejb30.interceptors.bindings;
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
import javax.interceptor.AroundInvoke;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJBException;
import javax.interceptor.InvocationContext;
import javax.interceptor.Interceptors;
import javax.interceptor.ExcludeDefaultInterceptors;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless3.java
index 5a8bb4b..8622ee3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless3.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.interceptors.bindings;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface Sless3
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless4.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless4.java
index a7e5304..c8e3911 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless4.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless4.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.interceptors.bindings;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface Sless4
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless5.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless5.java
index 01566c4..7d24ce3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless5.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless5.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.interceptors.bindings;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface Sless5
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless6.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless6.java
index 60fd9d5..8993276 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless6.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless6.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.interceptors.bindings;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface Sless6
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB3.java
index c0d28ea..e07b46a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB3.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb.ejb30.interceptors.bindings;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import javax.interceptor.Interceptors;
import javax.interceptor.ExcludeDefaultInterceptors;
import javax.interceptor.ExcludeClassInterceptors;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB4.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB4.java
index bb70e92..59097e4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB4.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB4.java
@@ -17,8 +17,8 @@
package com.sun.s1asdev.ejb.ejb30.interceptors.bindings;
-import javax.ejb.Stateless;
-import javax.ejb.EJBException;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.EJBException;
import javax.interceptor.Interceptors;
import javax.interceptor.ExcludeDefaultInterceptors;
import javax.interceptor.ExcludeClassInterceptors;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB5.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB5.java
index 89d9c8a..60ce772 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB5.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB5.java
@@ -17,8 +17,8 @@
package com.sun.s1asdev.ejb.ejb30.interceptors.bindings;
-import javax.ejb.Stateless;
-import javax.ejb.EJBException;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.EJBException;
import javax.interceptor.Interceptors;
import javax.interceptor.ExcludeDefaultInterceptors;
import javax.interceptor.ExcludeClassInterceptors;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB6.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB6.java
index 1f99594..7eb4a73 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB6.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB6.java
@@ -17,8 +17,8 @@
package com.sun.s1asdev.ejb.ejb30.interceptors.bindings;
-import javax.ejb.Stateless;
-import javax.ejb.EJBException;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.EJBException;
import javax.interceptor.Interceptors;
import javax.interceptor.ExcludeDefaultInterceptors;
import javax.interceptor.ExcludeClassInterceptors;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/client/Client.java
index ec4e090..4037f05 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/client/Client.java
@@ -19,7 +19,7 @@
import java.io.*;
import java.util.*;
import javax.naming.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import com.sun.s1asdev.ejb.ejb30.interceptors.session.*;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/BaseInterceptor.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/BaseInterceptor.java
index 39625d4..6ca24ab 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/BaseInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/BaseInterceptor.java
@@ -22,8 +22,8 @@
import javax.interceptor.InvocationContext;
import javax.interceptor.AroundInvoke;
import jakarta.annotation.PostConstruct;
-import javax.ejb.PrePassivate;
-import javax.ejb.PostActivate;
+import jakarta.ejb.PrePassivate;
+import jakarta.ejb.PostActivate;
public class BaseInterceptor
implements java.io.Serializable {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/BaseLifecycleInterceptor.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/BaseLifecycleInterceptor.java
index c16b72a..54bb437 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/BaseLifecycleInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/BaseLifecycleInterceptor.java
@@ -18,11 +18,11 @@
import javax.interceptor.InvocationContext;
import javax.interceptor.AroundInvoke;
-import javax.ejb.PrePassivate;
-import javax.ejb.PostActivate;
-import javax.ejb.EJB;
+import jakarta.ejb.PrePassivate;
+import jakarta.ejb.PostActivate;
+import jakarta.ejb.EJB;
import jakarta.annotation.Resource;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionContext;
public class BaseLifecycleInterceptor
implements java.io.Serializable {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DummyBaseEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DummyBaseEJB.java
index 43713e5..3c6c340 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DummyBaseEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DummyBaseEJB.java
@@ -19,11 +19,11 @@
import java.util.List;
import java.util.ArrayList;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import javax.interceptor.Interceptors;
import javax.interceptor.InvocationContext;
import javax.interceptor.AroundInvoke;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJBException;
import jakarta.annotation.PostConstruct;
public abstract class DummyBaseEJB
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DummyEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DummyEJB.java
index 8b9bfd6..83c4943 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DummyEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DummyEJB.java
@@ -16,11 +16,11 @@
package com.sun.s1asdev.ejb.ejb30.interceptors.session;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import javax.interceptor.Interceptors;
import javax.interceptor.InvocationContext;
import javax.interceptor.AroundInvoke;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJBException;
import jakarta.annotation.PostConstruct;
@Interceptors({
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DummyLevel2EJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DummyLevel2EJB.java
index 42609f3..4a8d95b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DummyLevel2EJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DummyLevel2EJB.java
@@ -16,11 +16,11 @@
package com.sun.s1asdev.ejb.ejb30.interceptors.session;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import javax.interceptor.Interceptors;
import javax.interceptor.InvocationContext;
import javax.interceptor.AroundInvoke;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJBException;
import jakarta.annotation.PostConstruct;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/LifecycleCallbackInterceptor.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/LifecycleCallbackInterceptor.java
index 18d1e8a..402a420 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/LifecycleCallbackInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/LifecycleCallbackInterceptor.java
@@ -22,15 +22,15 @@
import javax.interceptor.AroundInvoke;
-import javax.ejb.PrePassivate;
+import jakarta.ejb.PrePassivate;
-import javax.ejb.PostActivate;
+import jakarta.ejb.PostActivate;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import jakarta.annotation.Resource;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionContext;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/Sful.java
index f99daae..d03bf26 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/Sful.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.interceptors.session;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/SfulEJB.java
index f60f7c9..9acb73c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/SfulEJB.java
@@ -18,7 +18,7 @@
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
import javax.interceptor.InvocationContext;
@@ -26,9 +26,9 @@
import javax.interceptor.Interceptors;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/Sless.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/Sless.java
index 8aca9ba..a2ab35a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/Sless.java
@@ -18,7 +18,7 @@
-import javax.ejb.Local;
+import jakarta.ejb.Local;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/SlessEJB.java
index 1b56b3d..3304b90 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/SlessEJB.java
@@ -18,7 +18,7 @@
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/intro/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/intro/client/Client.java
index fdc1a93..ee21ea7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/intro/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/intro/client/Client.java
@@ -19,7 +19,7 @@
import java.io.*;
import java.util.*;
import javax.naming.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import com.sun.s1asdev.ejb.ejb30.interceptors.intro.*;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/intro/ejb/Sless.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/intro/ejb/Sless.java
index 6d316a8..098982f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/intro/ejb/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/intro/ejb/Sless.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.interceptors.intro;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface Sless
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/intro/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/intro/ejb/SlessEJB.java
index e9a912b..9571a1e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/intro/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/intro/ejb/SlessEJB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.interceptors.intro;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import javax.interceptor.Interceptors;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/client/Client.java
index b87e715..2b7cd66 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/client/Client.java
@@ -18,7 +18,7 @@
import java.io.*;
import java.util.*;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
import javax.naming.*;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/HelloStateful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/HelloStateful.java
index d4b4e77..236d28a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/HelloStateful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/HelloStateful.java
@@ -16,8 +16,8 @@
package com.sun.s1asdev.ejb.ejb30.interceptors.mdb;
-import javax.ejb.Stateful;
-import javax.ejb.Remove;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.Remove;
import jakarta.annotation.PreDestroy;
// Hello1 interface is not annotated with @Local. If the
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/HelloStateless.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/HelloStateless.java
index 5762ebc..4cf3920 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/HelloStateless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/HelloStateless.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.interceptors.mdb;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
// Hello1 interface is not annotated with @Local. If the
// bean only implements one interface it is assumed to be
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/MessageBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/MessageBean.java
index 748a6a0..6a9216d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/MessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/MessageBean.java
@@ -16,10 +16,10 @@
package com.sun.s1asdev.ejb.ejb30.interceptors.mdb;
-import javax.ejb.MessageDriven;
-import javax.ejb.EJBException;
-import javax.ejb.NoSuchEJBException;
-import javax.ejb.EJB;
+import jakarta.ejb.MessageDriven;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.NoSuchEJBException;
+import jakarta.ejb.EJB;
import javax.naming.InitialContext;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/client/Client.java
index 551d6f1..3884711 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/client/Client.java
@@ -19,7 +19,7 @@
import java.io.*;
import java.util.*;
import javax.naming.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import com.sun.s1asdev.ejb.ejb30.interceptors.session.*;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/BaseInterceptor.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/BaseInterceptor.java
index d7e6e31..bdc53c7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/BaseInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/BaseInterceptor.java
@@ -19,8 +19,8 @@
import javax.interceptor.InvocationContext;
import javax.interceptor.AroundInvoke;
import jakarta.annotation.PostConstruct;
-import javax.ejb.PrePassivate;
-import javax.ejb.PostActivate;
+import jakarta.ejb.PrePassivate;
+import jakarta.ejb.PostActivate;
public class BaseInterceptor {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/DummyEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/DummyEJB.java
index 8b2679e..8314cc3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/DummyEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/DummyEJB.java
@@ -16,11 +16,11 @@
package com.sun.s1asdev.ejb.ejb30.interceptors.session;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import javax.interceptor.Interceptors;
import javax.interceptor.InvocationContext;
import javax.interceptor.AroundInvoke;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJBException;
import jakarta.annotation.PostConstruct;
@Interceptors({
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/ErrorRecoveryInterceptor.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/ErrorRecoveryInterceptor.java
index aecfa04..23731f0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/ErrorRecoveryInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/ErrorRecoveryInterceptor.java
@@ -21,7 +21,7 @@
import javax.interceptor.InvocationContext;
import javax.interceptor.AroundInvoke;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
public class ErrorRecoveryInterceptor {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/LifecycleCallbackInterceptor.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/LifecycleCallbackInterceptor.java
index 0a33851..e54dc33 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/LifecycleCallbackInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/LifecycleCallbackInterceptor.java
@@ -19,11 +19,11 @@
import javax.interceptor.InvocationContext;
import javax.interceptor.AroundInvoke;
import javax.interceptor.InvocationContext;
-import javax.ejb.PrePassivate;
-import javax.ejb.PostActivate;
-import javax.ejb.EJB;
+import jakarta.ejb.PrePassivate;
+import jakarta.ejb.PostActivate;
+import jakarta.ejb.EJB;
import jakarta.annotation.Resource;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionContext;
public class LifecycleCallbackInterceptor {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/Sful.java
index 5774604..d270375 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/Sful.java
@@ -19,7 +19,7 @@
import java.util.Map;
import java.util.HashMap;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface Sful
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/SfulEJB.java
index 4949dc6..d46814f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/SfulEJB.java
@@ -19,13 +19,13 @@
import java.util.Map;
import java.util.HashMap;
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
import javax.interceptor.InvocationContext;
import javax.interceptor.AroundInvoke;
import javax.interceptor.Interceptors;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/Sless.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/Sless.java
index ea39b74..c8be6ec 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/Sless.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.interceptors.session;
-import javax.ejb.Local;
+import jakarta.ejb.Local;
@Local
public interface Sless
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/SlessEJB.java
index 3bfb5dc..6394dd0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/SlessEJB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.interceptors.session;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import javax.interceptor.Interceptors;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/client/Client.java
index bbe7d61..f75621c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/client/Client.java
@@ -19,7 +19,7 @@
import java.io.*;
import java.util.*;
import javax.naming.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import com.sun.ejb.devtest.Sless;
import com.sun.ejb.devtest.Sless30;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/ejb/com/sun/ejb/devtest/Sless.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/ejb/com/sun/ejb/devtest/Sless.java
index e56fbed..761cfe3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/ejb/com/sun/ejb/devtest/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/ejb/com/sun/ejb/devtest/Sless.java
@@ -16,7 +16,7 @@
package com.sun.ejb.devtest;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface Sless {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/ejb/com/sun/ejb/devtest/Sless30.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/ejb/com/sun/ejb/devtest/Sless30.java
index 34f4b0c..f11747d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/ejb/com/sun/ejb/devtest/Sless30.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/ejb/com/sun/ejb/devtest/Sless30.java
@@ -16,7 +16,7 @@
package com.sun.ejb.devtest;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface Sless30 {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/ejb/com/sun/ejb/devtest/Sless30Bean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/ejb/com/sun/ejb/devtest/Sless30Bean.java
index 072f10c..2d38653 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/ejb/com/sun/ejb/devtest/Sless30Bean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/ejb/com/sun/ejb/devtest/Sless30Bean.java
@@ -18,8 +18,8 @@
import jakarta.annotation.PostConstruct;
-import javax.ejb.Stateless;
-import javax.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.EJB;
@Stateless
public class Sless30Bean
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/ejb/com/sun/ejb/devtest/SlessBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/ejb/com/sun/ejb/devtest/SlessBean.java
index ec4a300..ee39cd2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/ejb/com/sun/ejb/devtest/SlessBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/ejb/com/sun/ejb/devtest/SlessBean.java
@@ -18,8 +18,8 @@
import jakarta.annotation.PostConstruct;
-import javax.ejb.Stateless;
-import javax.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.EJB;
@Stateless
public class SlessBean
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/client/Client.java
index 68c8340..da47a87 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/client/Client.java
@@ -19,7 +19,7 @@
import java.io.*;
import java.util.*;
import javax.naming.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import com.sun.ejb.devtest.Sless;
import com.sun.ejb.devtest.Sless30;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/ejb/com/sun/ejb/devtest/Sless.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/ejb/com/sun/ejb/devtest/Sless.java
index e56fbed..761cfe3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/ejb/com/sun/ejb/devtest/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/ejb/com/sun/ejb/devtest/Sless.java
@@ -16,7 +16,7 @@
package com.sun.ejb.devtest;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface Sless {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/ejb/com/sun/ejb/devtest/Sless30.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/ejb/com/sun/ejb/devtest/Sless30.java
index 34f4b0c..f11747d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/ejb/com/sun/ejb/devtest/Sless30.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/ejb/com/sun/ejb/devtest/Sless30.java
@@ -16,7 +16,7 @@
package com.sun.ejb.devtest;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface Sless30 {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/ejb/com/sun/ejb/devtest/Sless30Bean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/ejb/com/sun/ejb/devtest/Sless30Bean.java
index 072f10c..2d38653 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/ejb/com/sun/ejb/devtest/Sless30Bean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/ejb/com/sun/ejb/devtest/Sless30Bean.java
@@ -18,8 +18,8 @@
import jakarta.annotation.PostConstruct;
-import javax.ejb.Stateless;
-import javax.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.EJB;
@Stateless
public class Sless30Bean
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/ejb/com/sun/ejb/devtest/SlessBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/ejb/com/sun/ejb/devtest/SlessBean.java
index ec4a300..ee39cd2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/ejb/com/sun/ejb/devtest/SlessBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/ejb/com/sun/ejb/devtest/SlessBean.java
@@ -18,8 +18,8 @@
import jakarta.annotation.PostConstruct;
-import javax.ejb.Stateless;
-import javax.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.EJB;
@Stateless
public class SlessBean
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/client/Client.java
index 17a7975..ed3c2b3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/client/Client.java
@@ -18,7 +18,7 @@
import java.io.*;
import java.util.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import com.sun.s1asdev.ejb.ejb30.persistence.context.*;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/ejb/Sless.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/ejb/Sless.java
index 70b296b..fc0ceb9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/ejb/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/ejb/Sless.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.persistence.context;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface Sless {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/ejb/SlessBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/ejb/SlessBean.java
index 502cf47..0478556 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/ejb/SlessBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/ejb/SlessBean.java
@@ -18,15 +18,15 @@
import java.util.Vector;
import java.util.List;
-import javax.ejb.Stateless;
-import javax.ejb.EJBException;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.EJBException;
import javax.persistence.PersistenceContext;
import javax.persistence.PersistenceProperty;
import javax.persistence.TransactionRequiredException;
import javax.persistence.Query;
import javax.persistence.EntityManager;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
@Stateless
public class SlessBean implements Sless {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/client/Client.java
index 3710a66..4208da2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/client/Client.java
@@ -18,7 +18,7 @@
import java.io.*;
import java.util.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import com.sun.s1asdev.ejb.ejb30.persistence.eem_1slsb_2sfsbs.*;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/Sful.java
index e3ac600..574a66e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/Sful.java
@@ -18,7 +18,7 @@
import java.util.Map;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface Sful {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulBean.java
index 43aac52..0339f7a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulBean.java
@@ -21,17 +21,17 @@
import javax.naming.InitialContext;
-import javax.ejb.Stateful;
-import javax.ejb.EJB;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.EJB;
import javax.persistence.PersistenceContextType;
import javax.persistence.PersistenceContext;
import javax.persistence.EntityNotFoundException;
import javax.persistence.EntityManager;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.ejb.EJBException;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
+import jakarta.ejb.EJBException;
@Stateful
@EJB(name="ejb/SfulBean",
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulDelegate.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulDelegate.java
index fc89aaf..c4184a5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulDelegate.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulDelegate.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.persistence.eem_1slsb_2sfsbs;
-import javax.ejb.Local;
+import jakarta.ejb.Local;
import javax.persistence.EntityManager;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulDelegateBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulDelegateBean.java
index 0921954..8aeda75 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulDelegateBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulDelegateBean.java
@@ -16,15 +16,15 @@
package com.sun.s1asdev.ejb.ejb30.persistence.eem_1slsb_2sfsbs;
-import javax.ejb.Stateful;
-import javax.ejb.EJB;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.EJB;
import javax.persistence.PersistenceContextType;
import javax.persistence.PersistenceContext;
import javax.persistence.EntityNotFoundException;
import javax.persistence.EntityManager;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
@Stateful
public class SfulDelegateBean
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulPeer.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulPeer.java
index b5ea0fa..6e824d2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulPeer.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulPeer.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.persistence.eem_1slsb_2sfsbs;
-import javax.ejb.Local;
+import jakarta.ejb.Local;
import javax.persistence.EntityManager;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulPeerBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulPeerBean.java
index 5f017d0..4a6f788 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulPeerBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulPeerBean.java
@@ -16,14 +16,14 @@
package com.sun.s1asdev.ejb.ejb30.persistence.eem_1slsb_2sfsbs;
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
import javax.persistence.PersistenceContextType;
import javax.persistence.PersistenceContext;
import javax.persistence.EntityNotFoundException;
import javax.persistence.EntityManager;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
@Stateful
public class SfulPeerBean
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/Sless.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/Sless.java
index d188fa1..44e19fc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/Sless.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.persistence.eem_1slsb_2sfsbs;
-import javax.ejb.Local;
+import jakarta.ejb.Local;
import javax.persistence.EntityManager;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SlessBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SlessBean.java
index 80407d3..7c8b947 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SlessBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SlessBean.java
@@ -16,15 +16,15 @@
package com.sun.s1asdev.ejb.ejb30.persistence.eem_1slsb_2sfsbs;
-import javax.ejb.Stateless;
-import javax.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.EJB;
import javax.persistence.PersistenceContextType;
import javax.persistence.PersistenceContext;
import javax.persistence.EntityNotFoundException;
import javax.persistence.EntityManager;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
@Stateless
public class SlessBean
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/client/Client.java
index dfa8157..498fc5e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/client/Client.java
@@ -18,7 +18,7 @@
import java.io.*;
import java.util.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import com.sun.s1asdev.ejb.ejb30.persistence.eem_3sfsbs.*;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/Sful.java
index 4eb7b1a..5bb0871 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/Sful.java
@@ -18,7 +18,7 @@
import java.util.Map;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface Sful {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulBean.java
index 084f794..62867a8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulBean.java
@@ -21,17 +21,17 @@
import javax.naming.InitialContext;
-import javax.ejb.Stateful;
-import javax.ejb.EJB;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.EJB;
import javax.persistence.PersistenceContextType;
import javax.persistence.PersistenceContext;
import javax.persistence.EntityNotFoundException;
import javax.persistence.EntityManager;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.ejb.EJBException;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
+import jakarta.ejb.EJBException;
@Stateful
@EJB(name="ejb/SfulBean",
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulDelegate.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulDelegate.java
index 85de779..5fd2e87 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulDelegate.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulDelegate.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.persistence.eem_3sfsbs;
-import javax.ejb.Local;
+import jakarta.ejb.Local;
import javax.persistence.EntityManager;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulDelegateBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulDelegateBean.java
index e720e28..dd800fc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulDelegateBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulDelegateBean.java
@@ -16,15 +16,15 @@
package com.sun.s1asdev.ejb.ejb30.persistence.eem_3sfsbs;
-import javax.ejb.Stateful;
-import javax.ejb.EJB;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.EJB;
import javax.persistence.PersistenceContextType;
import javax.persistence.PersistenceContext;
import javax.persistence.EntityNotFoundException;
import javax.persistence.EntityManager;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
@Stateful
public class SfulDelegateBean
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulPeer.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulPeer.java
index cee2b22..3dcd1c9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulPeer.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulPeer.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.persistence.eem_3sfsbs;
-import javax.ejb.Local;
+import jakarta.ejb.Local;
import javax.persistence.EntityManager;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulPeerBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulPeerBean.java
index 0be8e5a..87b7bad 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulPeerBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulPeerBean.java
@@ -16,14 +16,14 @@
package com.sun.s1asdev.ejb.ejb30.persistence.eem_3sfsbs;
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
import javax.persistence.PersistenceContextType;
import javax.persistence.PersistenceContext;
import javax.persistence.EntityNotFoundException;
import javax.persistence.EntityManager;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
@Stateful
public class SfulPeerBean
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/client/Client.java
index e8cf1b9..440ace1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/client/Client.java
@@ -18,7 +18,7 @@
import java.io.*;
import java.util.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import com.sun.s1asdev.ejb.ejb30.persistence.eem_adapted.*;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/AdaptedLocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/AdaptedLocalHome.java
index bb0bcf6..867f81d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/AdaptedLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/AdaptedLocalHome.java
@@ -16,8 +16,8 @@
package com.sun.s1asdev.ejb.ejb30.persistence.eem_adapted;
-import javax.ejb.EJBLocalHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
public interface AdaptedLocalHome
extends EJBLocalHome {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/Sful.java
index 75a3aab..bf38d6a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/Sful.java
@@ -18,7 +18,7 @@
import java.util.Map;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface Sful {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/SfulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/SfulBean.java
index 6a24b91..62c0964 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/SfulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/SfulBean.java
@@ -21,9 +21,9 @@
import javax.naming.InitialContext;
-import javax.ejb.Stateful;
-import javax.ejb.EJB;
-import javax.ejb.LocalHome;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.EJB;
+import jakarta.ejb.LocalHome;
import javax.persistence.PersistenceContextType;
import javax.persistence.PersistenceContext;
@@ -31,9 +31,9 @@
import javax.persistence.EntityManager;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.ejb.EJBException;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
+import jakarta.ejb.EJBException;
@Stateful
public class SfulBean
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/SfulDelegate.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/SfulDelegate.java
index 872e267..7151fce 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/SfulDelegate.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/SfulDelegate.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.persistence.eem_adapted;
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
import javax.persistence.EntityManager;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/SfulDelegateBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/SfulDelegateBean.java
index 8e2df26..962eedf 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/SfulDelegateBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/SfulDelegateBean.java
@@ -16,17 +16,17 @@
package com.sun.s1asdev.ejb.ejb30.persistence.eem_adapted;
-import javax.ejb.Stateful;
-import javax.ejb.Init;
-import javax.ejb.LocalHome;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.Init;
+import jakarta.ejb.LocalHome;
import javax.persistence.PersistenceContextType;
import javax.persistence.PersistenceContext;
import javax.persistence.EntityNotFoundException;
import javax.persistence.EntityManager;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
@Stateful
@LocalHome(AdaptedLocalHome.class)
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/client/Client.java
index 5d61b2e..eae50e7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/client/Client.java
@@ -18,7 +18,7 @@
import java.io.*;
import java.util.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import com.sun.s1asdev.ejb.ejb30.persistence.eem_injection.*;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/Sful.java
index 933f2e8..3b603bc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/Sful.java
@@ -18,7 +18,7 @@
import java.util.Map;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface Sful {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/SfulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/SfulBean.java
index 0d32145..bdbe1ae 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/SfulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/SfulBean.java
@@ -21,17 +21,17 @@
import javax.naming.InitialContext;
-import javax.ejb.Stateful;
-import javax.ejb.EJB;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.EJB;
import javax.persistence.PersistenceContextType;
import javax.persistence.PersistenceContext;
import javax.persistence.EntityNotFoundException;
import javax.persistence.EntityManager;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.ejb.EJBException;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
+import jakarta.ejb.EJBException;
@Stateful
@EJB(name="ejb/SfulBean",
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/SfulDelegate.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/SfulDelegate.java
index 1878ca3..4977c00 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/SfulDelegate.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/SfulDelegate.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.persistence.eem_injection;
-import javax.ejb.Local;
+import jakarta.ejb.Local;
import javax.persistence.EntityManager;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/SfulDelegateBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/SfulDelegateBean.java
index 4ef8bf4..6ec4b18 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/SfulDelegateBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/SfulDelegateBean.java
@@ -16,14 +16,14 @@
package com.sun.s1asdev.ejb.ejb30.persistence.eem_injection;
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
import javax.persistence.PersistenceContextType;
import javax.persistence.PersistenceContext;
import javax.persistence.EntityNotFoundException;
import javax.persistence.EntityManager;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
@Stateful
public class SfulDelegateBean
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/client/Client.java
index 4934f07..ce271f8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/client/Client.java
@@ -20,7 +20,7 @@
import java.util.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import com.sun.s1asdev.ejb30.eempassivation.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/Sful.java
index 2182f60..7ae4482 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/Sful.java
@@ -18,7 +18,7 @@
import java.util.Map;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface Sful {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/SfulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/SfulBean.java
index 5c53c67..01455df 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/SfulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/SfulBean.java
@@ -19,15 +19,15 @@
import java.util.Map;
import java.util.HashMap;
import javax.naming.InitialContext;
-import javax.ejb.Stateful;
-import javax.ejb.EJB;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.EJB;
import javax.persistence.PersistenceContextType;
import javax.persistence.PersistenceContext;
import javax.persistence.EntityNotFoundException;
import javax.persistence.EntityManager;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.ejb.EJBException;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
+import jakarta.ejb.EJBException;
@Stateful
@EJB(name = "ejb/SfulBean", beanInterface = com.sun.s1asdev.ejb30.eempassivation.SfulDelegate.class)
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/SfulDelegate.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/SfulDelegate.java
index 4ecee29..fa1846c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/SfulDelegate.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/SfulDelegate.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb30.eempassivation;
-import javax.ejb.Local;
+import jakarta.ejb.Local;
import javax.persistence.EntityManager;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/SfulDelegateBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/SfulDelegateBean.java
index b0a0d35..28f80a7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/SfulDelegateBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/SfulDelegateBean.java
@@ -16,16 +16,16 @@
package com.sun.s1asdev.ejb30.eempassivation;
-import javax.ejb.Stateful;
-import javax.ejb.PostActivate;
-import javax.ejb.PrePassivate;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.PostActivate;
+import jakarta.ejb.PrePassivate;
import javax.persistence.PersistenceContextType;
import javax.persistence.PersistenceContext;
import javax.persistence.EntityNotFoundException;
import javax.persistence.EntityManager;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
@Stateful
public class SfulDelegateBean
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/Sless.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/Sless.java
index 53b7a36..f89da36 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/Sless.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb30.eempassivation;
-import javax.ejb.Local;
+import jakarta.ejb.Local;
@Local
public interface Sless {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/SlessBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/SlessBean.java
index a50f94f..a3a73e7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/SlessBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/SlessBean.java
@@ -16,8 +16,8 @@
package com.sun.s1asdev.ejb30.eempassivation;
-import javax.ejb.Stateless;
-import javax.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.EJB;
import javax.naming.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/client/Client.java
index fbe9a52..335a623 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/client/Client.java
@@ -18,7 +18,7 @@
import java.io.*;
import java.util.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import com.sun.s1asdev.ejb.ejb30.persistence.eempropagation.*;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/Sful.java
index 1b715ab..d36fc1f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/Sful.java
@@ -18,7 +18,7 @@
import java.util.Map;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface Sful {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/SfulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/SfulBean.java
index fe6a346..c014560 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/SfulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/SfulBean.java
@@ -21,17 +21,17 @@
import javax.naming.InitialContext;
-import javax.ejb.Stateful;
-import javax.ejb.EJB;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.EJB;
import javax.persistence.PersistenceContextType;
import javax.persistence.PersistenceContext;
import javax.persistence.EntityNotFoundException;
import javax.persistence.EntityManager;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.ejb.EJBException;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
+import jakarta.ejb.EJBException;
@Stateful
@EJB(name="ejb/SfulBean",
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/SfulDelegate.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/SfulDelegate.java
index 51c06c6..24c4bb3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/SfulDelegate.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/SfulDelegate.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.persistence.eempropagation;
-import javax.ejb.Local;
+import jakarta.ejb.Local;
import javax.persistence.EntityManager;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/SfulDelegateBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/SfulDelegateBean.java
index 3e3e233..1a0e0bc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/SfulDelegateBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/SfulDelegateBean.java
@@ -16,14 +16,14 @@
package com.sun.s1asdev.ejb.ejb30.persistence.eempropagation;
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
import javax.persistence.PersistenceContextType;
import javax.persistence.PersistenceContext;
import javax.persistence.EntityNotFoundException;
import javax.persistence.EntityManager;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
@Stateful
public class SfulDelegateBean
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/ejb/src/com/sun/s1asdev/ejb30/eemsfsbpassivation/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/ejb/src/com/sun/s1asdev/ejb30/eemsfsbpassivation/Sful.java
index be5f7d7..058b203 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/ejb/src/com/sun/s1asdev/ejb30/eemsfsbpassivation/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/ejb/src/com/sun/s1asdev/ejb30/eemsfsbpassivation/Sful.java
@@ -18,7 +18,7 @@
import java.util.Map;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface Sful {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/ejb/src/com/sun/s1asdev/ejb30/eemsfsbpassivation/SfulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/ejb/src/com/sun/s1asdev/ejb30/eemsfsbpassivation/SfulBean.java
index 086c8f4..53924de 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/ejb/src/com/sun/s1asdev/ejb30/eemsfsbpassivation/SfulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/ejb/src/com/sun/s1asdev/ejb30/eemsfsbpassivation/SfulBean.java
@@ -19,15 +19,15 @@
import java.util.Map;
import java.util.HashMap;
import javax.naming.InitialContext;
-import javax.ejb.Stateful;
-import javax.ejb.EJB;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.EJB;
import javax.persistence.PersistenceContextType;
import javax.persistence.PersistenceContext;
import javax.persistence.EntityNotFoundException;
import javax.persistence.EntityManager;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.ejb.EJBException;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
+import jakarta.ejb.EJBException;
@Stateful
public class SfulBean implements Sful {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/client/Client.java
index a03db72..a3952b8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/client/Client.java
@@ -18,7 +18,7 @@
import java.io.*;
import java.util.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import com.sun.s1asdev.ejb.ejb30.persistence.extendedem.*;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/ejb/Person.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/ejb/Person.java
index 241e79a..17ccc09 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/ejb/Person.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/ejb/Person.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.persistence.extendedem;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.persistence.*;
@Entity
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/ejb/Sful.java
index c0d4803..3d185b3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/ejb/Sful.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.persistence.extendedem;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface Sful {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/ejb/SfulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/ejb/SfulBean.java
index ec9e436..1f0d7d8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/ejb/SfulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/ejb/SfulBean.java
@@ -16,14 +16,14 @@
package com.sun.s1asdev.ejb.ejb30.persistence.extendedem;
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
import javax.persistence.PersistenceContextType;
import javax.persistence.PersistenceContext;
import javax.persistence.EntityNotFoundException;
import javax.persistence.EntityManager;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
@Stateful
public class SfulBean
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/client/Client.java
index 87a21a2..3e7d70c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/client/Client.java
@@ -19,7 +19,7 @@
import java.io.*;
import java.util.*;
import java.sql.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import javax.transaction.UserTransaction;
import jakarta.annotation.Resource;
import javax.sql.DataSource;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/Sful.java
index 4c970be..06e0dc5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/Sful.java
@@ -18,7 +18,7 @@
import java.util.Map;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface Sful {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/SfulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/SfulBean.java
index 5531853..c873b9f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/SfulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/SfulBean.java
@@ -21,17 +21,17 @@
import javax.naming.InitialContext;
-import javax.ejb.Stateful;
-import javax.ejb.EJB;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.EJB;
import javax.persistence.PersistenceContextType;
import javax.persistence.PersistenceContext;
import javax.persistence.EntityNotFoundException;
import javax.persistence.EntityManager;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.ejb.EJBException;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
+import jakarta.ejb.EJBException;
@Stateful
@EJB(name="ejb/SfulBean",
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/SfulDelegate.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/SfulDelegate.java
index 03e7f74..de756e7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/SfulDelegate.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/SfulDelegate.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.persistence.tx_propagation;
-import javax.ejb.Local;
+import jakarta.ejb.Local;
import javax.persistence.EntityManager;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/SfulDelegateBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/SfulDelegateBean.java
index f06f15c..714510f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/SfulDelegateBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/SfulDelegateBean.java
@@ -16,14 +16,14 @@
package com.sun.s1asdev.ejb.ejb30.persistence.tx_propagation;
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
import javax.persistence.PersistenceContextType;
import javax.persistence.PersistenceContext;
import javax.persistence.EntityNotFoundException;
import javax.persistence.EntityManager;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
@Stateful
public class SfulDelegateBean
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/client/Client.java
index 2e43cbf..1a7fd82 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/client/Client.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import javax.naming.InitialContext;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/ejb/SingletonBean.java
index 47dad57..693a122 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/ejb/SingletonBean.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import java.util.concurrent.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/ejb/SuperAsync.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/ejb/SuperAsync.java
index b06221a..a8e8cb0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/ejb/SuperAsync.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/ejb/SuperAsync.java
@@ -17,7 +17,7 @@
package com.acme;
import java.util.concurrent.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface SuperAsync {
public Future<String> hello(String name);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/client/Client.java
index 2343017..97ecdc3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/client/Client.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import javax.naming.InitialContext;
@@ -95,7 +95,7 @@
}
try {
- Future<String> f = statefulBeanLegacyRemote.throwException("javax.ejb.CreateException");
+ Future<String> f = statefulBeanLegacyRemote.throwException("jakarta.ejb.CreateException");
String result = f.get();
throw new EJBException("Didn't get CreateException");
} catch(ExecutionException ee) {
@@ -108,7 +108,7 @@
}
try {
- Future<String> f = statefulBeanLegacyRemote.throwException("javax.ejb.EJBException");
+ Future<String> f = statefulBeanLegacyRemote.throwException("jakarta.ejb.EJBException");
String result = f.get();
throw new EJBException("Didn't get EJBException");
} catch(ExecutionException ee) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/RemoteAsync.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/RemoteAsync.java
index b4cbd99..6354612 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/RemoteAsync.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/RemoteAsync.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.util.concurrent.*;
@Remote
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/RemoteAsync2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/RemoteAsync2.java
index 8146a01..75ccc74 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/RemoteAsync2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/RemoteAsync2.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.util.concurrent.*;
@Remote
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/RemoteAsync3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/RemoteAsync3.java
index c051996..3c76283 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/RemoteAsync3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/RemoteAsync3.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.util.concurrent.*;
@Remote
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/SingletonBean.java
index c66c696..b3d86207 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/SingletonBean.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import java.util.concurrent.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/StatefulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/StatefulBean.java
index 40a53c8..9089131 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/StatefulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/StatefulBean.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import java.util.concurrent.*;
@@ -47,9 +47,9 @@
@Asynchronous
public Future<String> throwException(String exception) throws CreateException {
- if( exception.equals("javax.ejb.CreateException") ) {
+ if( exception.equals("jakarta.ejb.CreateException") ) {
throw new CreateException();
- } else if ( exception.equals("javax.ejb.EJBException") ) {
+ } else if ( exception.equals("jakarta.ejb.EJBException") ) {
throw new EJBException();
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/threadpoolconfig/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/threadpoolconfig/client/Client.java
index f83bfd1..0d80aeb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/threadpoolconfig/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/threadpoolconfig/client/Client.java
@@ -16,7 +16,7 @@
package test;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import javax.naming.*;
import java.util.concurrent.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/threadpoolconfig/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/threadpoolconfig/ejb/Hello.java
index ef69e7d..4b5fa77 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/threadpoolconfig/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/threadpoolconfig/ejb/Hello.java
@@ -16,7 +16,7 @@
package test;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
import java.util.concurrent.*;
@Remote
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/threadpoolconfig/ejb/HelloBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/threadpoolconfig/ejb/HelloBean.java
index 8c2f42d..44c5141 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/threadpoolconfig/ejb/HelloBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/threadpoolconfig/ejb/HelloBean.java
@@ -16,7 +16,7 @@
package test;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import java.util.concurrent.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/war/AbstractBaseEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/war/AbstractBaseEJB.java
index 5d444b9..3d61b71 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/war/AbstractBaseEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/war/AbstractBaseEJB.java
@@ -16,7 +16,7 @@
package com.sun.s1as.devtests.ejb.generics;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.util.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/war/TestBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/war/TestBean.java
index e7fe06a..260f246 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/war/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/war/TestBean.java
@@ -17,7 +17,7 @@
package com.sun.s1as.devtests.ejb.generics;
import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
@Stateless
public class TestBean extends AbstractBaseEJB<Object> {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/war/TestServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/war/TestServlet.java
index 0dc558b..59056b3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/war/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/war/TestServlet.java
@@ -21,7 +21,7 @@
import javax.servlet.*;
import javax.servlet.http.*;
import jakarta.annotation.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
@javax.servlet.annotation.WebServlet(urlPatterns = "/TestServlet")
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/war/TypeVariableBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/war/TypeVariableBean.java
index ee4b07c..9888543 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/war/TypeVariableBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/war/TypeVariableBean.java
@@ -17,7 +17,7 @@
package com.sun.s1as.devtests.ejb.generics;
import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
@Stateless
public class TypeVariableBean<T> {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/BarManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/BarManagedBean.java
index 7d7cf27..d1df3f6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/BarManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/BarManagedBean.java
@@ -17,7 +17,7 @@
package com.acme;
import jakarta.annotation.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import jakarta.annotation.Resource;
import javax.sql.DataSource;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/FooManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/FooManagedBean.java
index 42950b4..807efa1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/FooManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/FooManagedBean.java
@@ -18,7 +18,7 @@
import jakarta.annotation.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import jakarta.annotation.Resource;
import javax.persistence.PersistenceContext;
import javax.persistence.EntityManager;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/HelloServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/HelloServlet.java
index 3e19563..b19027c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/HelloServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/HelloServlet.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import java.io.IOException;
import java.io.PrintWriter;
import java.sql.Connection;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/InterceptorA.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/InterceptorA.java
index 1f2378a..c1bd9b6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/InterceptorA.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/InterceptorA.java
@@ -18,7 +18,7 @@
import jakarta.annotation.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import jakarta.annotation.Resource;
import javax.persistence.PersistenceContext;
import javax.persistence.EntityManager;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/InterceptorB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/InterceptorB.java
index fd2c630..b72ac76 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/InterceptorB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/InterceptorB.java
@@ -22,7 +22,7 @@
import javax.interceptor.AroundInvoke;
import java.util.Map;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJBException;
public class InterceptorB extends InterceptorSuper {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/ManagedSuper.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/ManagedSuper.java
index 77a2d3d..a4a80da 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/ManagedSuper.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/ManagedSuper.java
@@ -17,7 +17,7 @@
package com.acme;
import jakarta.annotation.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import jakarta.annotation.Resource;
import javax.sql.DataSource;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/SingletonBean.java
index 63d118e..394ffce 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/SingletonBean.java
@@ -23,13 +23,13 @@
import jakarta.annotation.PreDestroy;
import jakarta.annotation.Resource;
-import javax.ejb.Singleton;
-import javax.ejb.Startup;
-import javax.ejb.EJBException;
-import javax.ejb.EJB;
-import javax.ejb.LocalBean;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.LocalBean;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionContext;
@Singleton
@LocalBean
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/StatefulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/StatefulBean.java
index 6cb2e78..e5a3a6a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/StatefulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/StatefulBean.java
@@ -16,8 +16,8 @@
package com.acme;
-import javax.ejb.Stateful;
-import javax.ejb.*;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.*;
import javax.interceptor.Interceptors;
import jakarta.annotation.PostConstruct;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/StatelessBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/StatelessBean.java
index 4f94e2f..c52310f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/StatelessBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/StatelessBean.java
@@ -16,8 +16,8 @@
package com.acme;
-import javax.ejb.Stateless;
-import javax.ejb.*;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.*;
import javax.interceptor.Interceptors;
import jakarta.annotation.PostConstruct;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/HelloServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/HelloServlet.java
index 1942e13..9d34425 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/HelloServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/HelloServlet.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import java.io.IOException;
import java.io.PrintWriter;
import java.sql.Connection;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/SingletonBean.java
index 0e69824..d382256 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/SingletonBean.java
@@ -23,10 +23,10 @@
import jakarta.annotation.PreDestroy;
import jakarta.annotation.Resource;
-import javax.ejb.Singleton;
-import javax.ejb.Startup;
-import javax.ejb.EJBException;
-import javax.ejb.EJB;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.EJB;
@Singleton
public class SingletonBean {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/StatelessBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/StatelessBean.java
index 633bd91..bd5e5a2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/StatelessBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/StatelessBean.java
@@ -16,8 +16,8 @@
package com.acme;
-import javax.ejb.Stateless;
-import javax.ejb.*;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.*;
import javax.interceptor.Interceptors;
import jakarta.annotation.PostConstruct;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/HelloServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/HelloServlet.java
index 8a2bd43..690fd72 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/HelloServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/HelloServlet.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import java.io.IOException;
import java.io.PrintWriter;
import java.sql.Connection;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/InterceptorA.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/InterceptorA.java
index 64a1924..9b0680a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/InterceptorA.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/InterceptorA.java
@@ -18,7 +18,7 @@
import jakarta.annotation.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import jakarta.annotation.Resource;
import javax.transaction.UserTransaction;
import javax.persistence.PersistenceContext;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/InterceptorB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/InterceptorB.java
index 10cca6f..7f9ce06 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/InterceptorB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/InterceptorB.java
@@ -18,7 +18,7 @@
import jakarta.annotation.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import jakarta.annotation.Resource;
import javax.transaction.UserTransaction;
import javax.persistence.PersistenceContext;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/ContextListener.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/ContextListener.java
index 4b906ba..9312076 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/ContextListener.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/ContextListener.java
@@ -24,7 +24,7 @@
import java.lang.reflect.Method;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
@WebListener
public class ContextListener implements ServletContextListener {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/HelloServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/HelloServlet.java
index 70f89aa..4043c97 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/HelloServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/HelloServlet.java
@@ -16,8 +16,8 @@
package com.acme;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
import java.io.IOException;
import java.io.PrintWriter;
import java.sql.Connection;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/SimpleSingleton.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/SimpleSingleton.java
index 6ef020c..0d7328b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/SimpleSingleton.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/SimpleSingleton.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import javax.naming.InitialContext;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/SimpleStateful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/SimpleStateful.java
index 43b7400..9c519b9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/SimpleStateful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/SimpleStateful.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
@Stateful
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/SimpleStateless.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/SimpleStateless.java
index b97cb41..066d15b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/SimpleStateless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/SimpleStateless.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
@Stateless
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/client/Client.java
index 6cea616..fc08df8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/client/Client.java
@@ -20,8 +20,8 @@
import java.util.Map;
import java.util.HashMap;
-import javax.ejb.*;
-import javax.ejb.embeddable.EJBContainer;
+import jakarta.ejb.*;
+import jakarta.ejb.embeddable.EJBContainer;
import javax.naming.Context;
import javax.naming.NamingException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/ejb/SimpleEjb.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/ejb/SimpleEjb.java
index ad0b022..a56f2f5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/ejb/SimpleEjb.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/ejb/SimpleEjb.java
@@ -19,7 +19,7 @@
import java.util.Collection;
import java.util.Date;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import javax.persistence.PersistenceContext;
import javax.persistence.EntityManager;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/ejb/SingletonBean.java
index 5956110..ca2784f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/ejb/SingletonBean.java
@@ -16,8 +16,8 @@
package org.glassfish.tests.ejb.sample;
-import javax.ejb.Singleton;
-import javax.ejb.Startup;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup;
import jakarta.annotation.PreDestroy;
import jakarta.annotation.PostConstruct;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/client/Client.java
index 5c5a8ce..0136dfb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/client/Client.java
@@ -22,8 +22,8 @@
import java.util.Date;
import java.util.Map;
import java.util.HashMap;
-import javax.ejb.*;
-import javax.ejb.embeddable.EJBContainer;
+import jakarta.ejb.*;
+import jakarta.ejb.embeddable.EJBContainer;
import javax.naming.Context;
import javax.naming.NamingException;
import javax.persistence.EntityManager;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/ejb/SimpleEjb.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/ejb/SimpleEjb.java
index 3aaa9f6..df9341d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/ejb/SimpleEjb.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/ejb/SimpleEjb.java
@@ -19,7 +19,7 @@
import java.util.Collection;
import java.util.Date;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import jakarta.annotation.sql.DataSourceDefinition;
import javax.persistence.PersistenceContext;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/client/Client.java
index c36d00c..558489e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/client/Client.java
@@ -20,8 +20,8 @@
import java.util.Map;
import java.util.HashMap;
-import javax.ejb.*;
-import javax.ejb.embeddable.EJBContainer;
+import jakarta.ejb.*;
+import jakarta.ejb.embeddable.EJBContainer;
import javax.naming.Context;
import javax.naming.NamingException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/ejb/OtherEjb.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/ejb/OtherEjb.java
index f26b5d8..255a4c1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/ejb/OtherEjb.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/ejb/OtherEjb.java
@@ -16,7 +16,7 @@
package org.glassfish.tests.ejb.sample;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
/**
*/
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/ejb/SimpleEjb.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/ejb/SimpleEjb.java
index b30b33f..2f1ebf9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/ejb/SimpleEjb.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/ejb/SimpleEjb.java
@@ -19,7 +19,7 @@
import java.util.Collection;
import java.util.Date;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.persistence.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/servlet/TestServlet.java
index b95d309..b2d1288 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/servlet/TestServlet.java
@@ -17,7 +17,7 @@
package test;
import java.io.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import javax.servlet.*;
import javax.servlet.http.*;
import javax.servlet.annotation.WebServlet;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/client/Client.java
index ef65be1..3e76411 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/client/Client.java
@@ -20,8 +20,8 @@
import java.util.Map;
import java.util.HashMap;
-import javax.ejb.*;
-import javax.ejb.embeddable.EJBContainer;
+import jakarta.ejb.*;
+import jakarta.ejb.embeddable.EJBContainer;
import javax.naming.Context;
import javax.naming.NamingException;
import java.net.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/ejb/SimpleEjb.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/ejb/SimpleEjb.java
index b0f9a5a..5110a44 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/ejb/SimpleEjb.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/ejb/SimpleEjb.java
@@ -19,7 +19,7 @@
import java.util.Collection;
import java.util.Date;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.persistence.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/servlet/TestServlet.java
index b95d309..b2d1288 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/servlet/TestServlet.java
@@ -17,7 +17,7 @@
package test;
import java.io.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import javax.servlet.*;
import javax.servlet.http.*;
import javax.servlet.annotation.WebServlet;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/client/Client.java
index 8c67365..cdb0d29 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/client/Client.java
@@ -18,8 +18,8 @@
import java.util.Map;
import java.util.HashMap;
-import javax.ejb.*;
-import javax.ejb.embeddable.EJBContainer;
+import jakarta.ejb.*;
+import jakarta.ejb.embeddable.EJBContainer;
import javax.naming.Context;
import javax.naming.NamingException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/HelloRemote.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/HelloRemote.java
index 4fe64fc..9a378d8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/HelloRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/HelloRemote.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface HelloRemote {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/SingletonBean.java
index 5400a2d..ed400ec 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/SingletonBean.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import javax.naming.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/StatefulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/StatefulBean.java
index f23a39c..cfd2dd5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/StatefulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/StatefulBean.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import javax.inject.Inject;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/StatefulBean2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/StatefulBean2.java
index 9862f24..ae2767f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/StatefulBean2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/StatefulBean2.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
@Stateful
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/client/Client.java
index 2b78b21..ee5e095 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/client/Client.java
@@ -19,8 +19,8 @@
import org.glassfish.tests.ejb.sample.Simple;
import embedded.util.ZipUtil;
-import javax.ejb.*;
-import javax.ejb.embeddable.EJBContainer;
+import jakarta.ejb.*;
+import jakarta.ejb.embeddable.EJBContainer;
import javax.naming.Context;
import javax.naming.NamingException;
import java.io.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/ejb/SimpleEjb.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/ejb/SimpleEjb.java
index 8093ff6..5ecfbd9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/ejb/SimpleEjb.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/ejb/SimpleEjb.java
@@ -16,7 +16,7 @@
package org.glassfish.tests.ejb.sample;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.persistence.*;
import jakarta.ws.rs.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/client/Client.java
index bbb1541..29a7738 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/client/Client.java
@@ -20,8 +20,8 @@
import java.util.Map;
import java.util.HashMap;
-import javax.ejb.*;
-import javax.ejb.embeddable.EJBContainer;
+import jakarta.ejb.*;
+import jakarta.ejb.embeddable.EJBContainer;
import javax.naming.Context;
import javax.naming.NamingException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/ejb/SimpleEjb.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/ejb/SimpleEjb.java
index ad0b022..a56f2f5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/ejb/SimpleEjb.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/ejb/SimpleEjb.java
@@ -19,7 +19,7 @@
import java.util.Collection;
import java.util.Date;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import javax.persistence.PersistenceContext;
import javax.persistence.EntityManager;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/ejb/SingletonBean.java
index 5956110..ca2784f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/ejb/SingletonBean.java
@@ -16,8 +16,8 @@
package org.glassfish.tests.ejb.sample;
-import javax.ejb.Singleton;
-import javax.ejb.Startup;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup;
import jakarta.annotation.PreDestroy;
import jakarta.annotation.PostConstruct;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/mdb/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/mdb/client/Client.java
index 58d1848..b12ef99 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/mdb/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/mdb/client/Client.java
@@ -18,8 +18,8 @@
import org.glassfish.tests.ejb.mdb.SimpleEjb;
-import javax.ejb.*;
-import javax.ejb.embeddable.EJBContainer;
+import jakarta.ejb.*;
+import jakarta.ejb.embeddable.EJBContainer;
import javax.naming.Context;
import javax.naming.NamingException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/mdb/ejb/SimpleEjb.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/mdb/ejb/SimpleEjb.java
index c15893d..cb0cdaf 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/mdb/ejb/SimpleEjb.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/mdb/ejb/SimpleEjb.java
@@ -16,7 +16,7 @@
package org.glassfish.tests.ejb.mdb;
-import javax.ejb.Singleton;
+import jakarta.ejb.Singleton;
import jakarta.jms.*;
import jakarta.annotation.Resource;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/mdb/ejb/SimpleMDB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/mdb/ejb/SimpleMDB.java
index 86bc71d..e1dd3fb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/mdb/ejb/SimpleMDB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/mdb/ejb/SimpleMDB.java
@@ -21,7 +21,7 @@
package org.glassfish.tests.ejb.mdb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/client/Client.java
index 361840e..64314fd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/client/Client.java
@@ -21,8 +21,8 @@
import java.util.Map;
import java.util.HashMap;
-import javax.ejb.*;
-import javax.ejb.embeddable.EJBContainer;
+import jakarta.ejb.*;
+import jakarta.ejb.embeddable.EJBContainer;
import javax.naming.Context;
import javax.naming.NamingException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/ejb/SimpleEjb.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/ejb/SimpleEjb.java
index ad0b022..a56f2f5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/ejb/SimpleEjb.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/ejb/SimpleEjb.java
@@ -19,7 +19,7 @@
import java.util.Collection;
import java.util.Date;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import javax.persistence.PersistenceContext;
import javax.persistence.EntityManager;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/ejb/SingletonBean.java
index 5956110..ca2784f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/ejb/SingletonBean.java
@@ -16,8 +16,8 @@
package org.glassfish.tests.ejb.sample;
-import javax.ejb.Singleton;
-import javax.ejb.Startup;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup;
import jakarta.annotation.PreDestroy;
import jakarta.annotation.PostConstruct;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/client/Client.java
index 0527841..30538e3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/client/Client.java
@@ -20,8 +20,8 @@
import java.util.Map;
import java.util.HashMap;
-import javax.ejb.*;
-import javax.ejb.embeddable.EJBContainer;
+import jakarta.ejb.*;
+import jakarta.ejb.embeddable.EJBContainer;
import javax.naming.Context;
import javax.naming.NamingException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/ejb/SimpleEjb.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/ejb/SimpleEjb.java
index 6b34d06..ad1af2c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/ejb/SimpleEjb.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/ejb/SimpleEjb.java
@@ -19,7 +19,7 @@
import java.util.Collection;
import java.util.Date;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import javax.persistence.PersistenceContext;
import javax.persistence.EntityManager;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/ejb/SimpleInterface.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/ejb/SimpleInterface.java
index 605516d..1d9a878 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/ejb/SimpleInterface.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/ejb/SimpleInterface.java
@@ -19,7 +19,7 @@
/**
* @author mvatkina
*/
-@javax.ejb.Local
+@jakarta.ejb.Local
public interface SimpleInterface {
public String saySomething() ;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/ejb/SingletonBean.java
index 5956110..ca2784f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/ejb/SingletonBean.java
@@ -16,8 +16,8 @@
package org.glassfish.tests.ejb.sample;
-import javax.ejb.Singleton;
-import javax.ejb.Startup;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup;
import jakarta.annotation.PreDestroy;
import jakarta.annotation.PostConstruct;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/client/Client.java
index 9c2d23d..735fef6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/client/Client.java
@@ -20,8 +20,8 @@
import java.util.Map;
import java.util.HashMap;
-import javax.ejb.*;
-import javax.ejb.embeddable.EJBContainer;
+import jakarta.ejb.*;
+import jakarta.ejb.embeddable.EJBContainer;
import javax.naming.Context;
import javax.naming.NamingException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/ejb/SimpleEjb.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/ejb/SimpleEjb.java
index 6b34d06..ad1af2c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/ejb/SimpleEjb.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/ejb/SimpleEjb.java
@@ -19,7 +19,7 @@
import java.util.Collection;
import java.util.Date;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import javax.persistence.PersistenceContext;
import javax.persistence.EntityManager;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/ejb/SimpleInterface.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/ejb/SimpleInterface.java
index 624b109..d1bb136 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/ejb/SimpleInterface.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/ejb/SimpleInterface.java
@@ -19,7 +19,7 @@
/**
* @author mvatkina
*/
-@javax.ejb.Local
+@jakarta.ejb.Local
public interface SimpleInterface {
public String saySomething() ;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/ejb/SingletonBean.java
index 5956110..ca2784f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/ejb/SingletonBean.java
@@ -16,8 +16,8 @@
package org.glassfish.tests.ejb.sample;
-import javax.ejb.Singleton;
-import javax.ejb.Startup;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup;
import jakarta.annotation.PreDestroy;
import jakarta.annotation.PostConstruct;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/client/Client.java
index e1d7ac2..2daf7f5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/client/Client.java
@@ -20,8 +20,8 @@
import java.util.Map;
import java.util.HashMap;
-import javax.ejb.*;
-import javax.ejb.embeddable.EJBContainer;
+import jakarta.ejb.*;
+import jakarta.ejb.embeddable.EJBContainer;
import javax.naming.Context;
import javax.naming.NamingException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/ejb/SimpleEjb.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/ejb/SimpleEjb.java
index ad0b022..a56f2f5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/ejb/SimpleEjb.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/ejb/SimpleEjb.java
@@ -19,7 +19,7 @@
import java.util.Collection;
import java.util.Date;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import javax.persistence.PersistenceContext;
import javax.persistence.EntityManager;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/ejb/SingletonBean.java
index 5956110..ca2784f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/ejb/SingletonBean.java
@@ -16,8 +16,8 @@
package org.glassfish.tests.ejb.sample;
-import javax.ejb.Singleton;
-import javax.ejb.Startup;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup;
import jakarta.annotation.PreDestroy;
import jakarta.annotation.PostConstruct;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/profile/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/profile/client/Client.java
index b2bfaef..a099532 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/profile/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/profile/client/Client.java
@@ -20,8 +20,8 @@
import java.util.Map;
import java.util.HashMap;
-import javax.ejb.*;
-import javax.ejb.embeddable.EJBContainer;
+import jakarta.ejb.*;
+import jakarta.ejb.embeddable.EJBContainer;
import javax.naming.Context;
import javax.naming.NamingException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/profile/ejb/Simple.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/profile/ejb/Simple.java
index 77ce77b..9fa56b0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/profile/ejb/Simple.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/profile/ejb/Simple.java
@@ -16,7 +16,7 @@
package org.glassfish.tests.ejb.profile;
-import javax.ejb.Local;
+import jakarta.ejb.Local;
/**
* @author Marina Vatkina
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/profile/ejb/SimpleEjb.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/profile/ejb/SimpleEjb.java
index c952d70..d9e43b7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/profile/ejb/SimpleEjb.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/profile/ejb/SimpleEjb.java
@@ -16,7 +16,7 @@
package org.glassfish.tests.ejb.profile;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
/**
* @author Marina Vatkina
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/remote/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/remote/client/Client.java
index 75284d2..bf8efa0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/remote/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/remote/client/Client.java
@@ -20,8 +20,8 @@
import java.util.Map;
import java.util.HashMap;
-import javax.ejb.*;
-import javax.ejb.embeddable.EJBContainer;
+import jakarta.ejb.*;
+import jakarta.ejb.embeddable.EJBContainer;
import javax.naming.Context;
import javax.naming.NamingException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/remote/ejb/SimpleEjb.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/remote/ejb/SimpleEjb.java
index 1f7c938..e3b2988 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/remote/ejb/SimpleEjb.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/remote/ejb/SimpleEjb.java
@@ -16,8 +16,8 @@
package org.glassfish.tests.ejb.remote;
-import javax.ejb.Stateless;
-import javax.ejb.Remote;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.Remote;
/**
* @author Marina Vatkina
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/client/Client.java
index 42e6209..e1a0a0c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/client/Client.java
@@ -20,8 +20,8 @@
import java.util.Map;
import java.util.HashMap;
-import javax.ejb.*;
-import javax.ejb.embeddable.EJBContainer;
+import jakarta.ejb.*;
+import jakarta.ejb.embeddable.EJBContainer;
import javax.naming.Context;
import javax.naming.NamingException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/ejb/SimpleEjb.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/ejb/SimpleEjb.java
index ad0b022..a56f2f5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/ejb/SimpleEjb.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/ejb/SimpleEjb.java
@@ -19,7 +19,7 @@
import java.util.Collection;
import java.util.Date;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import javax.persistence.PersistenceContext;
import javax.persistence.EntityManager;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/ejb/SingletonBean.java
index 5956110..ca2784f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/ejb/SingletonBean.java
@@ -16,8 +16,8 @@
package org.glassfish.tests.ejb.sample;
-import javax.ejb.Singleton;
-import javax.ejb.Startup;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup;
import jakarta.annotation.PreDestroy;
import jakarta.annotation.PostConstruct;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/testclose/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/testclose/client/Client.java
index fd1be74..ef82c87 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/testclose/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/testclose/client/Client.java
@@ -21,8 +21,8 @@
import java.util.Map;
import java.util.HashMap;
-import javax.ejb.*;
-import javax.ejb.embeddable.EJBContainer;
+import jakarta.ejb.*;
+import jakarta.ejb.embeddable.EJBContainer;
import javax.naming.Context;
import javax.naming.NamingException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/testclose/ejb/SimpleEjb.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/testclose/ejb/SimpleEjb.java
index 7c245e2..860d7b8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/testclose/ejb/SimpleEjb.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/testclose/ejb/SimpleEjb.java
@@ -19,7 +19,7 @@
import java.util.Collection;
import java.util.Date;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import javax.persistence.PersistenceContext;
import javax.persistence.EntityManager;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/timertest/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/timertest/client/Client.java
index 5b7a076..e86a3a8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/timertest/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/timertest/client/Client.java
@@ -20,8 +20,8 @@
import java.util.Map;
import java.util.HashMap;
-import javax.ejb.*;
-import javax.ejb.embeddable.EJBContainer;
+import jakarta.ejb.*;
+import jakarta.ejb.embeddable.EJBContainer;
import javax.naming.Context;
import javax.naming.NamingException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/timertest/ejb/SimpleEjb.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/timertest/ejb/SimpleEjb.java
index 197c8d6..21c8f43 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/timertest/ejb/SimpleEjb.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/timertest/ejb/SimpleEjb.java
@@ -16,7 +16,7 @@
package org.glassfish.tests.ejb.timertest;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.InitialContext;
/**
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twocontainers/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twocontainers/client/Client.java
index 3273a86..634986e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twocontainers/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twocontainers/client/Client.java
@@ -20,8 +20,8 @@
import java.util.Map;
import java.util.HashMap;
-import javax.ejb.*;
-import javax.ejb.embeddable.EJBContainer;
+import jakarta.ejb.*;
+import jakarta.ejb.embeddable.EJBContainer;
import javax.naming.Context;
import javax.naming.NamingException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twocontainers/ejb/SimpleEjb.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twocontainers/ejb/SimpleEjb.java
index 8ef2898..2960843 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twocontainers/ejb/SimpleEjb.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twocontainers/ejb/SimpleEjb.java
@@ -19,7 +19,7 @@
import java.util.Collection;
import java.util.Date;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import javax.persistence.PersistenceContext;
import javax.persistence.EntityManager;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/client/Client.java
index edbf696..4e52ed3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/client/Client.java
@@ -20,8 +20,8 @@
import java.util.Map;
import java.util.HashMap;
-import javax.ejb.*;
-import javax.ejb.embeddable.EJBContainer;
+import jakarta.ejb.*;
+import jakarta.ejb.embeddable.EJBContainer;
import javax.naming.Context;
import javax.naming.NamingException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/ejb/SimpleEjb.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/ejb/SimpleEjb.java
index 1eb2980..efa0b55 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/ejb/SimpleEjb.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/ejb/SimpleEjb.java
@@ -19,8 +19,8 @@
import java.util.Collection;
import java.util.Date;
-import javax.ejb.Stateless;
-import javax.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.EJB;
import jakarta.annotation.security.PermitAll;
import jakarta.annotation.security.DenyAll;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/ejb/SingletonBean.java
index 803a0e1..280923c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/ejb/SingletonBean.java
@@ -16,9 +16,9 @@
package org.glassfish.tests.ejb.sample;
-import javax.ejb.Singleton;
-import javax.ejb.Startup;
-import javax.ejb.SessionContext;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup;
+import jakarta.ejb.SessionContext;
import jakarta.annotation.Resource;
import jakarta.annotation.PreDestroy;
import jakarta.annotation.security.PermitAll;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/client/Client.java
index b6bacb8..58ab5f0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/client/Client.java
@@ -20,8 +20,8 @@
import java.util.Map;
import java.util.HashMap;
-import javax.ejb.*;
-import javax.ejb.embeddable.EJBContainer;
+import jakarta.ejb.*;
+import jakarta.ejb.embeddable.EJBContainer;
import javax.naming.Context;
import javax.naming.NamingException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/ejb/SimpleEjb.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/ejb/SimpleEjb.java
index 0a64c1a..c456c66 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/ejb/SimpleEjb.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/ejb/SimpleEjb.java
@@ -19,8 +19,8 @@
import java.util.Collection;
import java.util.Date;
-import javax.ejb.Stateless;
-import javax.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.EJB;
import jakarta.annotation.security.PermitAll;
import jakarta.annotation.security.DenyAll;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/ejb/SingletonBean.java
index 803a0e1..280923c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/ejb/SingletonBean.java
@@ -16,9 +16,9 @@
package org.glassfish.tests.ejb.sample;
-import javax.ejb.Singleton;
-import javax.ejb.Startup;
-import javax.ejb.SessionContext;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup;
+import jakarta.ejb.SessionContext;
import jakarta.annotation.Resource;
import jakarta.annotation.PreDestroy;
import jakarta.annotation.security.PermitAll;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/disable_nonportable_jndi/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/disable_nonportable_jndi/client/Client.java
index 260442d..aa3d791 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/disable_nonportable_jndi/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/disable_nonportable_jndi/client/Client.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import javax.naming.*;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/disable_nonportable_jndi/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/disable_nonportable_jndi/ejb/Hello.java
index 88dd732..d249627 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/disable_nonportable_jndi/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/disable_nonportable_jndi/ejb/Hello.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface Hello {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/disable_nonportable_jndi/ejb/HelloBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/disable_nonportable_jndi/ejb/HelloBean.java
index 65fcd72..610f7a4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/disable_nonportable_jndi/ejb/HelloBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/disable_nonportable_jndi/ejb/HelloBean.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
@Stateless(mappedName="HH")
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/BarManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/BarManagedBean.java
index 0d1d550..4d8ca0f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/BarManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/BarManagedBean.java
@@ -17,7 +17,7 @@
package com.acme;
import jakarta.annotation.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import jakarta.annotation.Resource;
import javax.sql.DataSource;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/FooManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/FooManagedBean.java
index def96fa..51a1269 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/FooManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/FooManagedBean.java
@@ -18,7 +18,7 @@
import jakarta.annotation.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import jakarta.annotation.Resource;
import javax.interceptor.Interceptors;
import org.omg.CORBA.ORB;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/HelloRemote.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/HelloRemote.java
index 4fe64fc..9a378d8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/HelloRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/HelloRemote.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface HelloRemote {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/HelloSingleton.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/HelloSingleton.java
index c9a3335..9f66d01 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/HelloSingleton.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/HelloSingleton.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import org.omg.CORBA.ORB;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/HelloStateless.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/HelloStateless.java
index cd99e41..3504771 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/HelloStateless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/HelloStateless.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import org.omg.CORBA.ORB;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/InterceptorA.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/InterceptorA.java
index 11f95d7..94276bc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/InterceptorA.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/InterceptorA.java
@@ -18,7 +18,7 @@
import jakarta.annotation.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import org.omg.CORBA.ORB;
import jakarta.annotation.Resource;
import javax.persistence.PersistenceContext;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/ManagedSuper.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/ManagedSuper.java
index 719ab5d..de1e35a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/ManagedSuper.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/ManagedSuper.java
@@ -17,7 +17,7 @@
package com.acme;
import jakarta.annotation.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import jakarta.annotation.Resource;
import javax.sql.DataSource;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/Singleton2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/Singleton2.java
index 7b8a433..53ecd16 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/Singleton2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/Singleton2.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/Singleton3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/Singleton3.java
index e67de47..6449f7a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/Singleton3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/Singleton3.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/Singleton4.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/Singleton4.java
index 7f36037..43e649a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/Singleton4.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/Singleton4.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/Foo2ManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/Foo2ManagedBean.java
index 359c5fc..a3e6b45 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/Foo2ManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/Foo2ManagedBean.java
@@ -18,7 +18,7 @@
import jakarta.annotation.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import jakarta.annotation.Resource;
import org.omg.CORBA.ORB;
import javax.persistence.PersistenceContext;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/Hello.java
index cfea5cc..309d17f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/Hello.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
public interface Hello {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/HelloRemote.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/HelloRemote.java
index 4fe64fc..9a378d8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/HelloRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/HelloRemote.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface HelloRemote {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/HelloS.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/HelloS.java
index c382e64..f9f954e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/HelloS.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/HelloS.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import org.omg.CORBA.ORB;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/HelloS2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/HelloS2.java
index a5eebe6..ab6c19f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/HelloS2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/HelloS2.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import org.omg.CORBA.ORB;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/HelloServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/HelloServlet.java
index 6cc0849..54a61e2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/HelloServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/HelloServlet.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import java.io.IOException;
import java.io.PrintWriter;
import java.sql.Connection;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/client/Client.java
index 513f584..a761d29 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/client/Client.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import javax.naming.InitialContext;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/Bar.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/Bar.java
index 25bfecd..d1e89ef 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/Bar.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/Bar.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import javax.interceptor.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/DependentWithInjectedDataSource.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/DependentWithInjectedDataSource.java
index d122859..c4a941e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/DependentWithInjectedDataSource.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/DependentWithInjectedDataSource.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import javax.interceptor.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SentenceTranslator.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SentenceTranslator.java
index 2c705f0..76f0773 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SentenceTranslator.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SentenceTranslator.java
@@ -16,7 +16,7 @@
package org.jboss.weld.examples.translator;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
@Stateless
public class SentenceTranslator implements Translator
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonBean.java
index 44445ec..f4e5b14 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonBean.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import javax.interceptor.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonBean2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonBean2.java
index 70c5786..827fd2e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonBean2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonBean2.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import javax.interceptor.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonBeanA.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonBeanA.java
index 8bc1e05..eb03ce4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonBeanA.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonBeanA.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import javax.interceptor.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonRemote.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonRemote.java
index 3f45b65..d0b8e5a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonRemote.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface SingletonRemote {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonStartupWithInjectedDependent.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonStartupWithInjectedDependent.java
index 8d1bd47..e471c70 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonStartupWithInjectedDependent.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonStartupWithInjectedDependent.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import javax.interceptor.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatefulLocal.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatefulLocal.java
index d69b61f..424a8e8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatefulLocal.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatefulLocal.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.Local;
+import jakarta.ejb.Local;
@Local
public interface StatefulLocal {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatelessBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatelessBean.java
index 697e335..34e580d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatelessBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatelessBean.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import javax.interceptor.ExcludeClassInterceptors;
import javax.interceptor.ExcludeDefaultInterceptors;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatelessBean2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatelessBean2.java
index 722f02a..008b8fa 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatelessBean2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatelessBean2.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import javax.inject.Inject;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatelessLocal.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatelessLocal.java
index 4f2fd84..ac557e5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatelessLocal.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatelessLocal.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.Local;
+import jakarta.ejb.Local;
@Local
public interface StatelessLocal {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatelessLocal2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatelessLocal2.java
index 4bc1af8..d999cc7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatelessLocal2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatelessLocal2.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.Local;
+import jakarta.ejb.Local;
@Local
public interface StatelessLocal2 {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/TextTranslator.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/TextTranslator.java
index 11fdaf5..b047439 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/TextTranslator.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/TextTranslator.java
@@ -18,7 +18,7 @@
import java.io.Serializable;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import javax.inject.Inject;
public class TextTranslator implements Serializable
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/Translator.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/Translator.java
index 5a82fdd..057830c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/Translator.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/Translator.java
@@ -16,7 +16,7 @@
package org.jboss.weld.examples.translator;
-import javax.ejb.Local;
+import jakarta.ejb.Local;
@Local
public interface Translator
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/TranslatorControllerBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/TranslatorControllerBean.java
index 4045b42..89488a8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/TranslatorControllerBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/TranslatorControllerBean.java
@@ -16,8 +16,8 @@
package org.jboss.weld.examples.translator;
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
+import jakarta.ejb.Remove;
+import jakarta.ejb.Stateful;
import javax.enterprise.context.RequestScoped;
import javax.inject.Inject;
import javax.inject.Named;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/client/Client.java
index 3f8fd4c..0e5499c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/client/Client.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import javax.naming.InitialContext;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/Hello.java
index f1cbfcb..0c973e8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/Hello.java
@@ -16,9 +16,9 @@
package com.acme;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
import java.util.concurrent.Future;
-import javax.ejb.Asynchronous;
+import jakarta.ejb.Asynchronous;
@Remote
public interface Hello {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/HelloBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/HelloBean.java
index c5f504d..4cf02f2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/HelloBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/HelloBean.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.interceptor.Interceptors;
import jakarta.annotation.*;
import java.util.concurrent.Future;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/HelloHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/HelloHome.java
index c3e9d39..d773e75 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/HelloHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/HelloHome.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/HelloRemote.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/HelloRemote.java
index 22ec5cf..c98e0d5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/HelloRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/HelloRemote.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
public interface HelloRemote extends EJBObject {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/NonSerializableInterceptor.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/NonSerializableInterceptor.java
index a32ddd6..e4c4a59 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/NonSerializableInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/NonSerializableInterceptor.java
@@ -19,7 +19,7 @@
import jakarta.annotation.*;
import javax.interceptor.InvocationContext;
import javax.interceptor.AroundInvoke;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJBException;
public class NonSerializableInterceptor {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/SingletonMultiIntf.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/SingletonMultiIntf.java
index 2c8fd91..42e9f94 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/SingletonMultiIntf.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/SingletonMultiIntf.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import java.util.concurrent.Future;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/SingletonNoIntf.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/SingletonNoIntf.java
index 6d0755c..0d53adb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/SingletonNoIntf.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/SingletonNoIntf.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import java.util.concurrent.Future;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/StatefulExpiration.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/StatefulExpiration.java
index c66acf2..7714e0b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/StatefulExpiration.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/StatefulExpiration.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import java.util.concurrent.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/StatefulNoIntf.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/StatefulNoIntf.java
index 29e427c..85a3874 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/StatefulNoIntf.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/StatefulNoIntf.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import java.util.concurrent.Future;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/StatelessNoIntf.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/StatelessNoIntf.java
index 4517632..c082754 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/StatelessNoIntf.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/StatelessNoIntf.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import java.util.concurrent.Future;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/client/Client.java
index deb410a..f61bbd2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/client/Client.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import javax.naming.InitialContext;
@@ -106,12 +106,12 @@
}
Future<String> futureException =
- hello.asyncThrowException("javax.ejb.ConcurrentAccessTimeoutException");
+ hello.asyncThrowException("jakarta.ejb.ConcurrentAccessTimeoutException");
try {
String result = futureException.get();
throw new EJBException("Should have gotten exception");
} catch(ExecutionException e) {
- if( e.getCause() instanceof javax.ejb.ConcurrentAccessTimeoutException) {
+ if( e.getCause() instanceof jakarta.ejb.ConcurrentAccessTimeoutException) {
System.out.println("Got correct async exception. Cause is " +
e.getCause().getMessage());
} else {
@@ -135,21 +135,21 @@
}
try {
- hello.throwException("javax.ejb.ConcurrentAccessException");
+ hello.throwException("jakarta.ejb.ConcurrentAccessException");
throw new EJBException("expected an exception");
} catch(ConcurrentAccessException cae) {
System.out.println("Got expected " + cae);
}
try {
- hello.throwException("javax.ejb.ConcurrentAccessTimeoutException");
+ hello.throwException("jakarta.ejb.ConcurrentAccessTimeoutException");
throw new EJBException("expected an exception");
} catch(ConcurrentAccessTimeoutException cat) {
System.out.println("Got expected " + cat);
}
try {
- hello.throwException("javax.ejb.IllegalLoopbackException");
+ hello.throwException("jakarta.ejb.IllegalLoopbackException");
throw new EJBException("expected an exception");
} catch(IllegalLoopbackException ile) {
System.out.println("Got expected " + ile);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/Blah.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/Blah.java
index ea6175a9..f0095d7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/Blah.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/Blah.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
public class Blah {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/Hello.java
index 4cffaf5..80eaa31 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/Hello.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
import java.util.concurrent.Future;
@Remote
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/HelloBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/HelloBean.java
index 5f19b42..eec3523 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/HelloBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/HelloBean.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import java.util.concurrent.Future;
@@ -97,13 +97,13 @@
}
public void throwException(String exceptionType) {
- if( exceptionType.equals("javax.ejb.EJBException") ) {
+ if( exceptionType.equals("jakarta.ejb.EJBException") ) {
throw new EJBException(exceptionType);
- } else if( exceptionType.equals("javax.ejb.ConcurrentAccessException") ) {
+ } else if( exceptionType.equals("jakarta.ejb.ConcurrentAccessException") ) {
throw new ConcurrentAccessException(exceptionType);
- } else if( exceptionType.equals("javax.ejb.ConcurrentAccessTimeoutException") ) {
+ } else if( exceptionType.equals("jakarta.ejb.ConcurrentAccessTimeoutException") ) {
throw new ConcurrentAccessTimeoutException(exceptionType);
- } else if( exceptionType.equals("javax.ejb.IllegalLoopbackException") ) {
+ } else if( exceptionType.equals("jakarta.ejb.IllegalLoopbackException") ) {
throw new IllegalLoopbackException(exceptionType);
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/HelloHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/HelloHome.java
index c3e9d39..d773e75 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/HelloHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/HelloHome.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/HelloRemote.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/HelloRemote.java
index 22ec5cf..c98e0d5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/HelloRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/HelloRemote.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
public interface HelloRemote extends EJBObject {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/SingletonBean.java
index 20effb9..37b1265 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/SingletonBean.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import javax.naming.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/client/Client.java
index 50c9f8d..9cad009 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/client/Client.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import javax.naming.InitialContext;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/Hello.java
index 4cffaf5..80eaa31 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/Hello.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
import java.util.concurrent.Future;
@Remote
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/HelloHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/HelloHome.java
index c3e9d39..d773e75 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/HelloHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/HelloHome.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/HelloRemote.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/HelloRemote.java
index 22ec5cf..c98e0d5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/HelloRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/HelloRemote.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
public interface HelloRemote extends EJBObject {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/RemoteAsync.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/RemoteAsync.java
index c44181d..a71309d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/RemoteAsync.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/RemoteAsync.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.util.concurrent.*;
@Remote
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/SingletonBean.java
index 320a063..06ac43e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/SingletonBean.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import javax.naming.InitialContext;
@@ -137,12 +137,12 @@
}
Future<String> futureException =
- hello.asyncThrowException("javax.ejb.ConcurrentAccessTimeoutException");
+ hello.asyncThrowException("jakarta.ejb.ConcurrentAccessTimeoutException");
try {
String result = futureException.get();
throw new EJBException("Should have gotten exception");
} catch(ExecutionException e) {
- if( e.getCause() instanceof javax.ejb.ConcurrentAccessTimeoutException) {
+ if( e.getCause() instanceof jakarta.ejb.ConcurrentAccessTimeoutException) {
System.out.println("Got correct async exception. Cause is " +
e.getCause().getMessage());
} else {
@@ -171,21 +171,21 @@
try {
- hello.throwException("javax.ejb.ConcurrentAccessException");
+ hello.throwException("jakarta.ejb.ConcurrentAccessException");
throw new EJBException("expected an exception");
} catch(ConcurrentAccessException cae) {
System.out.println("Got expected " + cae);
}
try {
- hello.throwException("javax.ejb.ConcurrentAccessTimeoutException");
+ hello.throwException("jakarta.ejb.ConcurrentAccessTimeoutException");
throw new EJBException("expected an exception");
} catch(ConcurrentAccessTimeoutException cat) {
System.out.println("Got expected " + cat);
}
try {
- hello.throwException("javax.ejb.IllegalLoopbackException");
+ hello.throwException("jakarta.ejb.IllegalLoopbackException");
throw new EJBException("expected an exception");
} catch(IllegalLoopbackException ile) {
System.out.println("Got expected " + ile);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/SingletonRemote.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/SingletonRemote.java
index 80db3eb..421333a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/SingletonRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/SingletonRemote.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface SingletonRemote {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/StatefulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/StatefulBean.java
index 9e0008b..0474062 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/StatefulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/StatefulBean.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import java.util.concurrent.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/client/Client.java
index c7d5e57..0028952 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/client/Client.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import javax.naming.InitialContext;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/descriptor/ejb-jar.xml
index 8597331..94b0383 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/descriptor/ejb-jar.xml
@@ -71,7 +71,7 @@
<timeout-method>
<method-name>mytimeout</method-name>
<method-params>
- <method-param>javax.ejb.Timer</method-param>
+ <method-param>jakarta.ejb.Timer</method-param>
</method-params>
</timeout-method>
<persistent>true</persistent>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/MultiBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/MultiBean.java
index 6072b30..9a54e8c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/MultiBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/MultiBean.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.InitialContext;
import jakarta.annotation.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/RemoteSingleton.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/RemoteSingleton.java
index 7c87a7f..8fe5193 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/RemoteSingleton.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/RemoteSingleton.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface RemoteSingleton {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/SingletonBean.java
index 13b1648..de2d2dc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/SingletonBean.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.PostConstruct;
import jakarta.annotation.PreDestroy;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/StatefulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/StatefulBean.java
index c82ffe9..6e7b9e7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/StatefulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/StatefulBean.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
public class StatefulBean {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/StatelessBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/StatelessBean.java
index 47fba0c..d134582 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/StatelessBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/StatelessBean.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
@Stateless
public class StatelessBean {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/client/Client.java
index 112a9d0..6942a4c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/client/Client.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import javax.naming.InitialContext;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/RemoteAsync.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/RemoteAsync.java
index b3b66e1..97a24c8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/RemoteAsync.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/RemoteAsync.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.util.concurrent.*;
@Remote
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/SingletonBean.java
index d75c96f..ef4b71f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/SingletonBean.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import java.util.concurrent.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulBeanNotSerialized.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulBeanNotSerialized.java
index de32063..35f62d3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulBeanNotSerialized.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulBeanNotSerialized.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
@Stateful(mappedName="StatefulBeanNotSerialized")
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulBeanSerialized.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulBeanSerialized.java
index c4e038e..84f9e38 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulBeanSerialized.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulBeanSerialized.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
@Stateful(mappedName="StatefulBeanSerialized")
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulBeanSuper.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulBeanSuper.java
index b8f752f..59c4f9f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulBeanSuper.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulBeanSuper.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import java.util.concurrent.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulCncLocal.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulCncLocal.java
index 755f873..418bd6e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulCncLocal.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulCncLocal.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.util.concurrent.*;
@Local
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulCncRemote.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulCncRemote.java
index dbc8bea..2a205b9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulCncRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulCncRemote.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.util.concurrent.*;
@Remote
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulCncSuperIntf.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulCncSuperIntf.java
index 325bb02..e248283 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulCncSuperIntf.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulCncSuperIntf.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.util.concurrent.*;
public interface StatefulCncSuperIntf {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloRemote.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloRemote.java
index 4fe64fc..9a378d8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloRemote.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface HelloRemote {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloServlet.java
index 0b0d50e..4ab1659 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloServlet.java
@@ -16,9 +16,9 @@
package com.acme;
-import javax.ejb.EJB;
-import javax.ejb.ConcurrentAccessException;
-import javax.ejb.ConcurrentAccessTimeoutException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.ConcurrentAccessException;
+import jakarta.ejb.ConcurrentAccessTimeoutException;
import java.io.IOException;
import java.io.PrintWriter;
import java.sql.Connection;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloSingleton.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloSingleton.java
index 18a7fe7..068370c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloSingleton.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloSingleton.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import java.util.concurrent.TimeUnit;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloSingleton2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloSingleton2.java
index d013d7c..3faf72b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloSingleton2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloSingleton2.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import javax.transaction.UserTransaction;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloStateful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloStateful.java
index fb1dc64..d908d14 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloStateful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloStateful.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import java.util.concurrent.TimeUnit;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloStateful2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloStateful2.java
index c8c8434..bed2194 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloStateful2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloStateful2.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
@Stateful
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloStateless.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloStateless.java
index cffd62a..8718981 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloStateless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloStateless.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
@Stateless
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/Super.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/Super.java
index 1a5006b..a99a527 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/Super.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/Super.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
@TransactionAttribute(TransactionAttributeType.SUPPORTS)
public class Super {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/Super1.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/Super1.java
index c95e8a7..04f10bd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/Super1.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/Super1.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import java.util.concurrent.TimeUnit;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/client/Client.java
index 1629b5b..99320c0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/client/Client.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import javax.naming.InitialContext;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/ejb/SingletonBean.java
index ff32f2f..58d1488 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/ejb/SingletonBean.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import jakarta.annotation.security.*;
import org.omg.CORBA.ORB;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/cache/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/cache/client/Client.java
index 8856566..31ed837 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/cache/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/cache/client/Client.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import javax.naming.InitialContext;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/cache/ejb/CacheBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/cache/ejb/CacheBean.java
index 0723a6a..d164b13 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/cache/ejb/CacheBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/cache/ejb/CacheBean.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicBoolean;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/cache/ejb/CacheRemote.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/cache/ejb/CacheRemote.java
index 9afc0cf..076b095 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/cache/ejb/CacheRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/cache/ejb/CacheRemote.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
import java.util.concurrent.Future;
@Remote
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/client/Client.java
index a801c46..c68e043 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/client/Client.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import javax.naming.InitialContext;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/ejb/Foo.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/ejb/Foo.java
index c341dcb..8f45828 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/ejb/Foo.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/ejb/Foo.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
public class Foo {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/ejb/Hello.java
index d7a154d..c763dcd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/ejb/Hello.java
@@ -20,7 +20,7 @@
String hello();
- @javax.ejb.Asynchronous
+ @jakarta.ejb.Asynchronous
void async();
void test_Err_or(String s1, String s2);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/ejb/SingletonBean.java
index 393b5c2..94aab9c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/ejb/SingletonBean.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.persistence.*;
import jakarta.annotation.*;
import org.omg.CORBA.ORB;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/client/Client.java
index e425b88..e460cbf 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/client/Client.java
@@ -20,8 +20,8 @@
import java.util.Map;
import java.util.HashMap;
-import javax.ejb.*;
-import javax.ejb.embeddable.EJBContainer;
+import jakarta.ejb.*;
+import jakarta.ejb.embeddable.EJBContainer;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/singleton.iml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/singleton.iml
index 407952f..fa133f4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/singleton.iml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/singleton.iml
@@ -31,7 +31,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../glassfishv3/glassfish/modules/javax.ejb.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../glassfishv3/glassfish/modules/jakarta.ejb.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod1/BeanA_Mod1.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod1/BeanA_Mod1.java
index 1d66b99..cde7170 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod1/BeanA_Mod1.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod1/BeanA_Mod1.java
@@ -24,9 +24,9 @@
import org.glassfish.devtest.ejb31.singleton.multimodule.servlet.RemoteInitTracker;
import org.glassfish.devtest.ejb31.singleton.multimodule.servlet.LocalInitTracker;
-import javax.ejb.Singleton;
-import javax.ejb.EJB;
-import javax.ejb.DependsOn;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.EJB;
+import jakarta.ejb.DependsOn;
import jakarta.annotation.PostConstruct;
/**
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod1/RootBean_Mod1.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod1/RootBean_Mod1.java
index 125364f..f10b62f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod1/RootBean_Mod1.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod1/RootBean_Mod1.java
@@ -24,10 +24,10 @@
import org.glassfish.devtest.ejb31.singleton.multimodule.servlet.RemoteInitTracker;
import org.glassfish.devtest.ejb31.singleton.multimodule.servlet.LocalInitTracker;
-import javax.ejb.DependsOn;
-import javax.ejb.Singleton;
-import javax.ejb.Startup;
-import javax.ejb.EJB;
+import jakarta.ejb.DependsOn;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup;
+import jakarta.ejb.EJB;
import jakarta.annotation.PostConstruct;
/**
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/BeanA_Mod2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/BeanA_Mod2.java
index 368dd83..b96868f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/BeanA_Mod2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/BeanA_Mod2.java
@@ -24,8 +24,8 @@
import org.glassfish.devtest.ejb31.singleton.multimodule.servlet.RemoteInitTracker;
import org.glassfish.devtest.ejb31.singleton.multimodule.servlet.LocalInitTracker;
-import javax.ejb.Singleton;
-import javax.ejb.EJB;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.EJB;
import jakarta.annotation.PostConstruct;
/**
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/RootBean_Mod2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/RootBean_Mod2.java
index 4b0f349..a9738b1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/RootBean_Mod2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/RootBean_Mod2.java
@@ -24,10 +24,10 @@
import org.glassfish.devtest.ejb31.singleton.multimodule.servlet.RemoteInitTracker;
import org.glassfish.devtest.ejb31.singleton.multimodule.servlet.LocalInitTracker;
-import javax.ejb.DependsOn;
-import javax.ejb.Singleton;
-import javax.ejb.Startup;
-import javax.ejb.EJB;
+import jakarta.ejb.DependsOn;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup;
+import jakarta.ejb.EJB;
import jakarta.annotation.PostConstruct;
/**
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/InitOrderTrackerBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/InitOrderTrackerBean.java
index e816fd0..4404cdd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/InitOrderTrackerBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/InitOrderTrackerBean.java
@@ -21,10 +21,10 @@
package org.glassfish.devtest.ejb31.singleton.multimodule.servlet;
-import javax.ejb.Singleton;
-import javax.ejb.Startup;
-import javax.ejb.Local;
-import javax.ejb.Remote;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup;
+import jakarta.ejb.Local;
+import jakarta.ejb.Remote;
import jakarta.annotation.PostConstruct;
import java.util.Map;
import java.util.HashMap;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/LocalInitTracker.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/LocalInitTracker.java
index 27d0a56..dd49b4d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/LocalInitTracker.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/LocalInitTracker.java
@@ -16,7 +16,7 @@
package org.glassfish.devtest.ejb31.singleton.multimodule.servlet;
-import javax.ejb.Local;
+import jakarta.ejb.Local;
import java.util.Map;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/RemoteInitTracker.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/RemoteInitTracker.java
index 2ff3488..b486aaf 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/RemoteInitTracker.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/RemoteInitTracker.java
@@ -16,7 +16,7 @@
package org.glassfish.devtest.ejb31.singleton.multimodule.servlet;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
import java.util.Map;
@Remote
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/client/Client.java
index a2291fc..aeb38c4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/client/Client.java
@@ -21,8 +21,8 @@
import java.util.Map;
import java.util.HashMap;
import java.util.List;
-import javax.ejb.*;
-import javax.ejb.embeddable.EJBContainer;
+import jakarta.ejb.*;
+import jakarta.ejb.embeddable.EJBContainer;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/singleton.iml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/singleton.iml
index 407952f..fa133f4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/singleton.iml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/singleton.iml
@@ -31,7 +31,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../glassfishv3/glassfish/modules/javax.ejb.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../glassfishv3/glassfish/modules/jakarta.ejb.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod1/BeanA_Mod1.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod1/BeanA_Mod1.java
index ae8d6e8..34ab343 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod1/BeanA_Mod1.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod1/BeanA_Mod1.java
@@ -24,9 +24,9 @@
import org.glassfish.devtest.ejb31.singleton.servlet.RemoteInitTracker;
import org.glassfish.devtest.ejb31.singleton.servlet.LocalInitTracker;
-import javax.ejb.Singleton;
-import javax.ejb.EJB;
-import javax.ejb.DependsOn;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.EJB;
+import jakarta.ejb.DependsOn;
import jakarta.annotation.PostConstruct;
/**
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod1/RootBean_Mod1.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod1/RootBean_Mod1.java
index 0724ac1..1fdc8e0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod1/RootBean_Mod1.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod1/RootBean_Mod1.java
@@ -24,10 +24,10 @@
import org.glassfish.devtest.ejb31.singleton.servlet.RemoteInitTracker;
import org.glassfish.devtest.ejb31.singleton.servlet.LocalInitTracker;
-import javax.ejb.DependsOn;
-import javax.ejb.Singleton;
-import javax.ejb.Startup;
-import javax.ejb.EJB;
+import jakarta.ejb.DependsOn;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup;
+import jakarta.ejb.EJB;
import jakarta.annotation.PostConstruct;
/**
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/BeanA_Mod2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/BeanA_Mod2.java
index 2e5750b..2b60295 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/BeanA_Mod2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/BeanA_Mod2.java
@@ -24,8 +24,8 @@
import org.glassfish.devtest.ejb31.singleton.servlet.RemoteInitTracker;
import org.glassfish.devtest.ejb31.singleton.servlet.LocalInitTracker;
-import javax.ejb.Singleton;
-import javax.ejb.EJB;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.EJB;
import jakarta.annotation.PostConstruct;
/**
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/RootBean_Mod2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/RootBean_Mod2.java
index aa8cb90..900d211 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/RootBean_Mod2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/RootBean_Mod2.java
@@ -24,10 +24,10 @@
import org.glassfish.devtest.ejb31.singleton.servlet.RemoteInitTracker;
import org.glassfish.devtest.ejb31.singleton.servlet.LocalInitTracker;
-import javax.ejb.DependsOn;
-import javax.ejb.Singleton;
-import javax.ejb.Startup;
-import javax.ejb.EJB;
+import jakarta.ejb.DependsOn;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup;
+import jakarta.ejb.EJB;
import jakarta.annotation.PostConstruct;
/**
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/InitOrderTrackerBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/InitOrderTrackerBean.java
index 15fde73..c6b101d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/InitOrderTrackerBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/InitOrderTrackerBean.java
@@ -21,10 +21,10 @@
package org.glassfish.devtest.ejb31.singleton.servlet;
-import javax.ejb.Singleton;
-import javax.ejb.Startup;
-import javax.ejb.Local;
-import javax.ejb.Remote;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup;
+import jakarta.ejb.Local;
+import jakarta.ejb.Remote;
import jakarta.annotation.PostConstruct;
import java.util.List;
import java.util.ArrayList;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/LocalInitTracker.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/LocalInitTracker.java
index 855d29f..a2ccdd8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/LocalInitTracker.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/LocalInitTracker.java
@@ -16,7 +16,7 @@
package org.glassfish.devtest.ejb31.singleton.servlet;
-import javax.ejb.Local;
+import jakarta.ejb.Local;
import java.util.List;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/RemoteInitTracker.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/RemoteInitTracker.java
index 80ab1c7..10e94e9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/RemoteInitTracker.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/RemoteInitTracker.java
@@ -16,7 +16,7 @@
package org.glassfish.devtest.ejb31.singleton.servlet;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
import java.util.List;
@Remote
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/client/Client.java
index e837fc5..8b7e34f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/client/Client.java
@@ -18,8 +18,8 @@
import java.io.*;
import java.util.*;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
import com.sun.s1asdev.ejb.ejb31.aroundtimeout.*;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/descriptor/ejb-jar.xml
index 1a4d3c5..8bae126 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/descriptor/ejb-jar.xml
@@ -126,7 +126,7 @@
<method>
<method-name>eg</method-name>
<method-params>
- <method-param>javax.ejb.Timer</method-param>
+ <method-param>jakarta.ejb.Timer</method-param>
</method-params>
</method>
</interceptor-binding>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Common.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Common.java
index 0162e03..c1c2a53 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Common.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Common.java
@@ -24,8 +24,8 @@
import java.util.Collections;
import javax.interceptor.InvocationContext;
-import javax.ejb.EJBException;
-import javax.ejb.Timer;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.Timer;
public class Common {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorA.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorA.java
index 9a26ab7..1054f3a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorA.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorA.java
@@ -20,7 +20,7 @@
import javax.interceptor.InvocationContext;
import jakarta.annotation.PostConstruct;
import javax.naming.InitialContext;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionContext;
import jakarta.annotation.Resource;
public class InterceptorA {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless3.java
index 414c4b8..cfc4e10 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless3.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb31.aroundtimeout;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface Sless3
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless4.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless4.java
index 95fcbd2..5b56aa6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless4.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless4.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb31.aroundtimeout;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface Sless4
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless5.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless5.java
index 98ab8fa..4fcb31e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless5.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless5.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb31.aroundtimeout;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface Sless5
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless6.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless6.java
index 9329e52..77f94db 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless6.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless6.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb31.aroundtimeout;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface Sless6
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB3.java
index 6785395..101e4f5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB3.java
@@ -17,9 +17,9 @@
package com.sun.s1asdev.ejb.ejb31.aroundtimeout;
-import javax.ejb.Stateless;
-import javax.ejb.Schedule;
-import javax.ejb.EJBException;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.Schedule;
+import jakarta.ejb.EJBException;
import javax.interceptor.Interceptors;
import javax.interceptor.ExcludeDefaultInterceptors;
import javax.interceptor.ExcludeClassInterceptors;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB4.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB4.java
index 7a29c3b..32db506 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB4.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB4.java
@@ -17,11 +17,11 @@
package com.sun.s1asdev.ejb.ejb31.aroundtimeout;
import java.util.Collection;
-import javax.ejb.Stateless;
-import javax.ejb.Schedule;
-import javax.ejb.Timer;
-import javax.ejb.TimerService;
-import javax.ejb.EJBException;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.Schedule;
+import jakarta.ejb.Timer;
+import jakarta.ejb.TimerService;
+import jakarta.ejb.EJBException;
import javax.interceptor.Interceptors;
import javax.interceptor.ExcludeDefaultInterceptors;
import javax.interceptor.ExcludeClassInterceptors;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB5.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB5.java
index cf53634..4413953 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB5.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB5.java
@@ -17,10 +17,10 @@
package com.sun.s1asdev.ejb.ejb31.aroundtimeout;
-import javax.ejb.Stateless;
-import javax.ejb.Schedule;
-import javax.ejb.Timer;
-import javax.ejb.EJBException;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.Schedule;
+import jakarta.ejb.Timer;
+import jakarta.ejb.EJBException;
import javax.interceptor.Interceptors;
import javax.interceptor.ExcludeDefaultInterceptors;
import javax.interceptor.ExcludeClassInterceptors;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB6.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB6.java
index 04168bd..d6599b2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB6.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB6.java
@@ -17,11 +17,11 @@
package com.sun.s1asdev.ejb.ejb31.aroundtimeout;
-import javax.ejb.Stateless;
-import javax.ejb.Schedule;
-import javax.ejb.Timer;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.Schedule;
+import jakarta.ejb.Timer;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
import javax.interceptor.Interceptors;
import javax.interceptor.ExcludeDefaultInterceptors;
import javax.interceptor.ExcludeClassInterceptors;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB7.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB7.java
index 728d7db..09716b8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB7.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB7.java
@@ -17,9 +17,9 @@
package com.sun.s1asdev.ejb.ejb31.aroundtimeout;
-import javax.ejb.Stateless;
-import javax.ejb.Schedule;
-import javax.ejb.EJBException;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.Schedule;
+import jakarta.ejb.EJBException;
import javax.interceptor.Interceptors;
import javax.interceptor.ExcludeDefaultInterceptors;
import javax.interceptor.ExcludeClassInterceptors;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/keepstate/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/keepstate/client/Client.java
index 68f7bf4..b1d85fe 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/keepstate/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/keepstate/client/Client.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.timer31.keepstate.client;
-import javax.ejb.*;
+import jakarta.ejb.*;
import com.sun.s1asdev.ejb31.timer.keepstate.KeepStateIF;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/keepstate/ejb/KeepStateBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/keepstate/ejb/KeepStateBean.java
index 4d859fa..0a0a08a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/keepstate/ejb/KeepStateBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/keepstate/ejb/KeepStateBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb31.timer.keepstate;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.util.List;
import java.util.ArrayList;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/keepstate/ejb/KeepStateIF.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/keepstate/ejb/KeepStateIF.java
index c0e28c2..a7f530f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/keepstate/ejb/KeepStateIF.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/keepstate/ejb/KeepStateIF.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb31.timer.keepstate;
-@javax.ejb.Remote
+@jakarta.ejb.Remote
public interface KeepStateIF {
public static final String OLD_INFO = "xxx";
public static final String NEW_INFO = "yyy";
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/client/Client.java
index 268fbb9..7c6869e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/client/Client.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import javax.naming.InitialContext;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/descriptor/ejb-jar.xml
index b4b9136..07ae654 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/descriptor/ejb-jar.xml
@@ -32,7 +32,7 @@
<timeout-method>
<method-name>onDDTimeout</method-name>
<method-params>
- <method-param>javax.ejb.Timer</method-param>
+ <method-param>jakarta.ejb.Timer</method-param>
</method-params>
</timeout-method>
<info>dd_timer</info>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/ejb/MessageBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/ejb/MessageBean.java
index c43ece1..dfdfef7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/ejb/MessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/ejb/MessageBean.java
@@ -16,22 +16,22 @@
package com.acme;
-import javax.ejb.MessageDriven;
-import javax.ejb.EJB;
-import javax.ejb.Schedule;
-import javax.ejb.Timer;
+import jakarta.ejb.MessageDriven;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Schedule;
+import jakarta.ejb.Timer;
import javax.interceptor.AroundTimeout;
import javax.interceptor.InvocationContext;
import javax.interceptor.Interceptors;
import jakarta.annotation.Resource;
-import javax.ejb.MessageDrivenContext;
+import jakarta.ejb.MessageDrivenContext;
import jakarta.jms.MessageListener;
import jakarta.jms.Message;
import jakarta.annotation.PostConstruct;
import jakarta.annotation.PreDestroy;
import jakarta.annotation.security.*;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJBException;
@Interceptors(InterceptorA.class)
@MessageDriven(mappedName="jms/ejb_ejb31_timer31_mdb_InQueue", description="mymessagedriven bean description")
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/ejb/SingletonBean.java
index 5c849e5..6494096 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/ejb/SingletonBean.java
@@ -19,7 +19,7 @@
import java.util.Set;
import java.util.HashSet;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import org.omg.CORBA.ORB;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/methodintf/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/methodintf/client/Client.java
index c0b92d7..93c157c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/methodintf/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/methodintf/client/Client.java
@@ -16,7 +16,7 @@
package client.timer31.methodintf;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import ejb31.timer.methodintf.Stles;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/methodintf/ejb/Stles.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/methodintf/ejb/Stles.java
index a2741b7..8885b4a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/methodintf/ejb/Stles.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/methodintf/ejb/Stles.java
@@ -16,7 +16,7 @@
package ejb31.timer.methodintf;
-@javax.ejb.Remote
+@jakarta.ejb.Remote
public interface Stles {
public boolean verifyTimers() throws Exception;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/methodintf/ejb/StlesEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/methodintf/ejb/StlesEJB.java
index b9dd6f8..45b6fea 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/methodintf/ejb/StlesEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/methodintf/ejb/StlesEJB.java
@@ -16,7 +16,7 @@
package ejb31.timer.methodintf;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.Resource;
@Stateless
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/client/Client.java
index 8842704..0a357f1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/client/Client.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.timer31.nonpersistenttimer.client;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import com.sun.s1asdev.ejb31.timer.nonpersistenttimer.StatefulWrapper;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/descriptor/ejb-jar.xml
index 114168e..562be71 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/descriptor/ejb-jar.xml
@@ -221,7 +221,7 @@
<ejb-name>msgbean_CMT</ejb-name>
<method-name>ejbTimeout</method-name>
<method-params>
- <method-param>javax.ejb.Timer</method-param>
+ <method-param>jakarta.ejb.Timer</method-param>
</method-params>
</method>
<trans-attribute>RequiresNew</trans-attribute>
@@ -239,7 +239,7 @@
<ejb-name>FooEJB_CMT</ejb-name>
<method-name>ejbTimeout</method-name>
<method-params>
- <method-param>javax.ejb.Timer</method-param>
+ <method-param>jakarta.ejb.Timer</method-param>
</method-params>
</method>
<trans-attribute>RequiresNew</trans-attribute>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/Foo.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/Foo.java
index 14d87c8..b63f1d7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/Foo.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/Foo.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb31.timer.nonpersistenttimer;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface Foo extends EJBLocalObject, TimerStuff {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/FooEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/FooEJB.java
index d0189b6..731db69 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/FooEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/FooEJB.java
@@ -16,9 +16,9 @@
package com.sun.s1asdev.ejb31.timer.nonpersistenttimer;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.*;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.*;
public class FooEJB extends TimerStuffImpl implements SessionBean, TimedObject {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/FooHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/FooHome.java
index eed0222..4cc0ad9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/FooHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/FooHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb31.timer.nonpersistenttimer;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface FooHome extends EJBLocalHome {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/MessageDrivenEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/MessageDrivenEJB.java
index 7145510..a41cdce 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/MessageDrivenEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/MessageDrivenEJB.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb31.timer.nonpersistenttimer;
import jakarta.jms.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
public class MessageDrivenEJB extends TimerStuffImpl
implements MessageDrivenBean, TimedObject, MessageListener {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/StatefulWrapper.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/StatefulWrapper.java
index b6a61d4..58d80d8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/StatefulWrapper.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/StatefulWrapper.java
@@ -16,12 +16,12 @@
package com.sun.s1asdev.ejb31.timer.nonpersistenttimer;
-//@javax.ejb.Remote
+//@jakarta.ejb.Remote
public interface StatefulWrapper {
public boolean doMessageDrivenTest(String jndiName, boolean jms);
public boolean doFooTest(String jndiName, boolean jms);
- public void removeFoo() throws java.rmi.RemoteException, javax.ejb.RemoveException;
+ public void removeFoo() throws java.rmi.RemoteException, jakarta.ejb.RemoveException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/StatefulWrapperImpl.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/StatefulWrapperImpl.java
index 62fdeee..37ef97c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/StatefulWrapperImpl.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/StatefulWrapperImpl.java
@@ -17,11 +17,11 @@
package com.sun.s1asdev.ejb31.timer.nonpersistenttimer;
import java.util.Date;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.rmi.PortableRemoteObject;
-//@javax.ejb.Stateful
+//@jakarta.ejb.Stateful
public class StatefulWrapperImpl implements StatefulWrapper {
private SessionContext context;
@@ -298,7 +298,7 @@
timerStuff.assertNoTimers();
}
- public void removeFoo() throws java.rmi.RemoteException, javax.ejb.RemoveException {
+ public void removeFoo() throws java.rmi.RemoteException, jakarta.ejb.RemoveException {
if (foo != null) {
((Foo) foo).remove();
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/TimerStuff.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/TimerStuff.java
index 9537649..b0770e5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/TimerStuff.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/TimerStuff.java
@@ -18,7 +18,7 @@
import java.io.Serializable;
import java.util.Date;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface TimerStuff {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/TimerStuffImpl.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/TimerStuffImpl.java
index 25345e3..1267451 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/TimerStuffImpl.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/TimerStuffImpl.java
@@ -23,7 +23,7 @@
import java.util.Date;
import java.util.Collection;
import java.util.Iterator;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.jms.QueueConnectionFactory;
import jakarta.jms.QueueConnection;
import jakarta.jms.Queue;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/reschedule_after_failures/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/reschedule_after_failures/client/Client.java
index 8cc0c2f..7ddeae1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/reschedule_after_failures/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/reschedule_after_failures/client/Client.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.timer31.reschedule_after_failures.client;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import com.sun.s1asdev.ejb31.timer.reschedule_after_failures.Stles;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/reschedule_after_failures/ejb/Stles.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/reschedule_after_failures/ejb/Stles.java
index 985160d..04f3d72 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/reschedule_after_failures/ejb/Stles.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/reschedule_after_failures/ejb/Stles.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb31.timer.reschedule_after_failures;
-@javax.ejb.Remote
+@jakarta.ejb.Remote
public interface Stles {
public void createTimers() throws Exception;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/reschedule_after_failures/ejb/StlesEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/reschedule_after_failures/ejb/StlesEJB.java
index 1d739be..a9c068c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/reschedule_after_failures/ejb/StlesEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/reschedule_after_failures/ejb/StlesEJB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb31.timer.reschedule_after_failures;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.interceptor.InvocationContext;
import jakarta.annotation.Resource;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_ann/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_ann/client/Client.java
index dd653f9..eb62bc4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_ann/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_ann/client/Client.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.timer31.schedule_ann.client;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import com.sun.s1asdev.ejb31.timer.schedule_ann.Stles;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_ann/ejb/Stles.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_ann/ejb/Stles.java
index b17410f..e4539fa 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_ann/ejb/Stles.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_ann/ejb/Stles.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb31.timer.schedule_ann;
-@javax.ejb.Remote
+@jakarta.ejb.Remote
public interface Stles {
public void verifyTimers() throws Exception;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_ann/ejb/StlesEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_ann/ejb/StlesEJB.java
index d173416..ecbf26a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_ann/ejb/StlesEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_ann/ejb/StlesEJB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb31.timer.schedule_ann;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.Resource;
import java.util.Map;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/client/Client.java
index 9e24248..623387d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/client/Client.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.timer31.schedule_exp.client;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import com.sun.s1asdev.ejb31.timer.schedule_exp.Stles;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/ejb/Stles.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/ejb/Stles.java
index 9908063..b83baba 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/ejb/Stles.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/ejb/Stles.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb31.timer.schedule_exp;
-@javax.ejb.Remote
+@jakarta.ejb.Remote
public interface Stles {
public void createTimers() throws Exception;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/ejb/StlesEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/ejb/StlesEJB.java
index 6856585..447f521 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/ejb/StlesEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/ejb/StlesEJB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb31.timer.schedule_exp;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.interceptor.AroundTimeout;
import javax.interceptor.InvocationContext;
import jakarta.annotation.Resource;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/client/Client.java
index c7f2100..99ae483 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/client/Client.java
@@ -22,7 +22,7 @@
import java.util.Properties;
import java.util.Set;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.rmi.PortableRemoteObject;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/descriptor/ejb-jar.xml
index 2166400..48e8ca4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/descriptor/ejb-jar.xml
@@ -36,7 +36,7 @@
<timeout-method>
<method-name>ejbTimeout</method-name>
<method-params>
- <method-param>javax.ejb.Timer</method-param>
+ <method-param>jakarta.ejb.Timer</method-param>
</method-params>
</timeout-method>
<info>Timer00</info>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/ejb/StlesEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/ejb/StlesEJB.java
index 69c07b5..953da94 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/ejb/StlesEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/ejb/StlesEJB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb31.timer.schedule_on_ejb_timeout;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
import java.util.HashSet;
import java.util.Set;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/HelloServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/HelloServlet.java
index 8ef5995..70a66a0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/HelloServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/HelloServlet.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb32.ejblite.async;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.io.*;
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/SingletonBean.java
index 751f640..4ce2f5d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/SingletonBean.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import javax.naming.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/StatefulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/StatefulBean.java
index 0e2e7d0..3a92359 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/StatefulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/StatefulBean.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
@Stateful
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/StatefulBean2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/StatefulBean2.java
index 9862f24..ae2767f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/StatefulBean2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/StatefulBean2.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
@Stateful
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/Foo.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/Foo.java
index ef29f61..39b58b5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/Foo.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/Foo.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb32.ejblite.timer;
-import javax.ejb.*;
+import jakarta.ejb.*;
@Local
public interface Foo extends TimerStuff {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/FooBMT.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/FooBMT.java
index 325f974..5f12bff 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/FooBMT.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/FooBMT.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb32.ejblite.timer;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
@Stateless
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/FooCMT.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/FooCMT.java
index 756607d..cf9437e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/FooCMT.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/FooCMT.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb32.ejblite.timer;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
@Stateless
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/HelloServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/HelloServlet.java
index 7ab8608..a521a47 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/HelloServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/HelloServlet.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb32.ejblite.timer;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import java.io.IOException;
import java.io.PrintWriter;
import java.sql.Connection;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/StatefulWrapper.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/StatefulWrapper.java
index 3514be9..d7d55da 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/StatefulWrapper.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/StatefulWrapper.java
@@ -16,10 +16,10 @@
package com.sun.s1asdev.ejb32.ejblite.timer;
-@javax.ejb.Local
+@jakarta.ejb.Local
public interface StatefulWrapper {
public boolean doFooTest(boolean bmt);
- public void removeFoo() throws java.rmi.RemoteException, javax.ejb.RemoveException;
+ public void removeFoo() throws java.rmi.RemoteException, jakarta.ejb.RemoveException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/StatefulWrapperImpl.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/StatefulWrapperImpl.java
index 7de55d3..d83116a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/StatefulWrapperImpl.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/StatefulWrapperImpl.java
@@ -22,7 +22,7 @@
import java.util.Properties;
import java.util.Set;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.Resource;
@Stateful
@@ -161,7 +161,7 @@
timerStuff.assertNoTimers();
}
- public void removeFoo() throws javax.ejb.RemoveException {
+ public void removeFoo() throws jakarta.ejb.RemoveException {
if (foo != null) {
foo.remove();
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/TimerStuff.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/TimerStuff.java
index 63679b1..091a7c5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/TimerStuff.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/TimerStuff.java
@@ -18,7 +18,7 @@
import java.io.Serializable;
import java.util.Date;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface TimerStuff {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/TimerStuffImpl.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/TimerStuffImpl.java
index 1e81be9..9d75068 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/TimerStuffImpl.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/TimerStuffImpl.java
@@ -23,7 +23,7 @@
import java.util.Date;
import java.util.Collection;
import java.util.Iterator;
-import javax.ejb.*;
+import jakarta.ejb.*;
public class TimerStuffImpl implements TimerStuff {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/embedded/autoclose/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/embedded/autoclose/client/Client.java
index d038d33..39a739d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/embedded/autoclose/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/embedded/autoclose/client/Client.java
@@ -20,8 +20,8 @@
import java.util.Map;
import java.util.HashMap;
-import javax.ejb.*;
-import javax.ejb.embeddable.EJBContainer;
+import jakarta.ejb.*;
+import jakarta.ejb.embeddable.EJBContainer;
import javax.naming.Context;
import javax.naming.NamingException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/embedded/autoclose/ejb/SimpleEjb.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/embedded/autoclose/ejb/SimpleEjb.java
index 134e71e..221f72e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/embedded/autoclose/ejb/SimpleEjb.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/embedded/autoclose/ejb/SimpleEjb.java
@@ -16,7 +16,7 @@
package org.glassfish.tests.ejb.autoclose;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
/**
* @author Marina Vatkina
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/client/Client.java
index 439be0e..b5bdc40 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/client/Client.java
@@ -19,7 +19,7 @@
import java.io.*;
import java.util.*;
import javax.naming.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
public class Client {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/BaseBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/BaseBean.java
index b04d7fa..a82a0aa 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/BaseBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/BaseBean.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import javax.interceptor.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SfulEJB.java
index 26be205..edfd099 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SfulEJB.java
@@ -21,7 +21,7 @@
import javax.interceptor.Interceptors;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SingletonBean.java
index 1dfd1e5..980fb66 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SingletonBean.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import javax.interceptor.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SlessEJB.java
index fcaa602..9b951ab 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SlessEJB.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.interceptor.*;
import jakarta.annotation.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SlessEJB2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SlessEJB2.java
index 85abd87..168c62d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SlessEJB2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SlessEJB2.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import javax.interceptor.*;
import jakarta.annotation.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/Snglt.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/Snglt.java
index e1983ce..32f548d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/Snglt.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/Snglt.java
@@ -16,7 +16,7 @@
package com.acme;
-@javax.ejb.Remote
+@jakarta.ejb.Remote
public interface Snglt {
public String hello();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean.java
index 62b575c..64fe03c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean.java
@@ -18,7 +18,7 @@
import jakarta.annotation.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import jakarta.annotation.Resource;
import javax.interceptor.Interceptors;
import org.omg.CORBA.ORB;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean2.java
index aec7e7c..92e4927 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean2.java
@@ -18,7 +18,7 @@
import jakarta.annotation.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import jakarta.annotation.Resource;
import javax.interceptor.Interceptors;
import org.omg.CORBA.ORB;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean3.java
index 2c9ad1c..fcc7358 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean3.java
@@ -18,7 +18,7 @@
import jakarta.annotation.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import jakarta.annotation.Resource;
import javax.interceptor.Interceptors;
import org.omg.CORBA.ORB;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/client/Client.java
index 439be0e..b5bdc40 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/client/Client.java
@@ -19,7 +19,7 @@
import java.io.*;
import java.util.*;
import javax.naming.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
public class Client {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/BaseBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/BaseBean.java
index 9fd05a1..52b1737 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/BaseBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/BaseBean.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import javax.interceptor.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SfulEJB.java
index 9fb32a8..8253139 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SfulEJB.java
@@ -21,7 +21,7 @@
import javax.interceptor.Interceptors;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SingletonBean.java
index fb381be..dbd5530 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SingletonBean.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import javax.interceptor.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SlessEJB.java
index e6b1c0f..16968c1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SlessEJB.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.interceptor.*;
import jakarta.annotation.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SlessEJB2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SlessEJB2.java
index 6e6c0cc..da30d59 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SlessEJB2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SlessEJB2.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import javax.interceptor.*;
import jakarta.annotation.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/Snglt.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/Snglt.java
index e1983ce..32f548d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/Snglt.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/Snglt.java
@@ -16,7 +16,7 @@
package com.acme;
-@javax.ejb.Remote
+@jakarta.ejb.Remote
public interface Snglt {
public String hello();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SomeManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SomeManagedBean.java
index 8b873f0..58fe2a6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SomeManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SomeManagedBean.java
@@ -18,7 +18,7 @@
import jakarta.annotation.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import jakarta.annotation.Resource;
import org.omg.CORBA.ORB;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/client/Client.java
index 439be0e..b5bdc40 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/client/Client.java
@@ -19,7 +19,7 @@
import java.io.*;
import java.util.*;
import javax.naming.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
public class Client {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/BaseBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/BaseBean.java
index cbcf350..7d12d60 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/BaseBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/BaseBean.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import javax.interceptor.*;
import java.lang.reflect.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SfulEJB.java
index ab70c23..da687a4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SfulEJB.java
@@ -21,7 +21,7 @@
import javax.interceptor.Interceptors;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SingletonBean.java
index e83e682..af151e6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SingletonBean.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import javax.interceptor.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SlessEJB.java
index cb0edf4..e33fdb4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SlessEJB.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.interceptor.*;
import jakarta.annotation.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SlessEJB2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SlessEJB2.java
index c13d9aa..d418ee0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SlessEJB2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SlessEJB2.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import javax.interceptor.*;
import jakarta.annotation.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SlessEJB3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SlessEJB3.java
index 0a1f22e..745658a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SlessEJB3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SlessEJB3.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.interceptor.*;
import jakarta.annotation.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/Snglt.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/Snglt.java
index e1983ce..32f548d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/Snglt.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/Snglt.java
@@ -16,7 +16,7 @@
package com.acme;
-@javax.ejb.Remote
+@jakarta.ejb.Remote
public interface Snglt {
public String hello();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean.java
index 9380117..a314c5a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean.java
@@ -18,7 +18,7 @@
import jakarta.annotation.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import jakarta.annotation.Resource;
import javax.interceptor.Interceptors;
import org.omg.CORBA.ORB;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean2.java
index e7ac442..fff6454 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean2.java
@@ -18,7 +18,7 @@
import jakarta.annotation.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import jakarta.annotation.Resource;
import javax.interceptor.ExcludeClassInterceptors;
import javax.interceptor.Interceptors;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean3.java
index 2d499bb..e726baf 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean3.java
@@ -18,7 +18,7 @@
import jakarta.annotation.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import jakarta.annotation.Resource;
import javax.interceptor.ExcludeClassInterceptors;
import javax.interceptor.Interceptors;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/client/Client.java
index 439be0e..b5bdc40 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/client/Client.java
@@ -19,7 +19,7 @@
import java.io.*;
import java.util.*;
import javax.naming.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
public class Client {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/BaseBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/BaseBean.java
index efe9692..282c1d7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/BaseBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/BaseBean.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import javax.interceptor.*;
import java.lang.reflect.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SfulEJB.java
index 550caa6..7199209 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SfulEJB.java
@@ -21,7 +21,7 @@
import javax.interceptor.Interceptors;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SingletonBean.java
index a77424a..e070b7b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SingletonBean.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import javax.interceptor.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SlessEJB.java
index 6eb9327..9a2ff30 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SlessEJB.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.interceptor.*;
import jakarta.annotation.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SlessEJB2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SlessEJB2.java
index 94148fb..5b392da 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SlessEJB2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SlessEJB2.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import javax.interceptor.*;
import jakarta.annotation.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SlessEJB3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SlessEJB3.java
index 1263644..457c3d2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SlessEJB3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SlessEJB3.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.interceptor.*;
import jakarta.annotation.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/Snglt.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/Snglt.java
index e1983ce..32f548d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/Snglt.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/Snglt.java
@@ -16,7 +16,7 @@
package com.acme;
-@javax.ejb.Remote
+@jakarta.ejb.Remote
public interface Snglt {
public String hello();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/client/Client.java
index 439be0e..b5bdc40 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/client/Client.java
@@ -19,7 +19,7 @@
import java.io.*;
import java.util.*;
import javax.naming.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
public class Client {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/BaseBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/BaseBean.java
index 057c9c6..752249c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/BaseBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/BaseBean.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import javax.interceptor.*;
import java.lang.reflect.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SfulEJB.java
index 6f8d43d..7bfa7d2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SfulEJB.java
@@ -21,7 +21,7 @@
import javax.interceptor.Interceptors;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SingletonBean.java
index af6e641..fc7d740 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SingletonBean.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import javax.interceptor.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SlessEJB.java
index cb66ca0..18b48ce 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SlessEJB.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.interceptor.*;
import jakarta.annotation.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SlessEJB2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SlessEJB2.java
index c2c9d6b..a479865 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SlessEJB2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SlessEJB2.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import javax.interceptor.*;
import jakarta.annotation.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SlessEJB3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SlessEJB3.java
index 9752b21..9fb18dc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SlessEJB3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SlessEJB3.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.interceptor.*;
import jakarta.annotation.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/Snglt.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/Snglt.java
index e1983ce..32f548d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/Snglt.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/Snglt.java
@@ -16,7 +16,7 @@
package com.acme;
-@javax.ejb.Remote
+@jakarta.ejb.Remote
public interface Snglt {
public String hello();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SomeManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SomeManagedBean.java
index c4565dc..2cc4208 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SomeManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SomeManagedBean.java
@@ -18,7 +18,7 @@
import jakarta.annotation.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import jakarta.annotation.Resource;
import javax.interceptor.Interceptors;
import org.omg.CORBA.ORB;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SomeManagedBeanBase.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SomeManagedBeanBase.java
index 1df1e1b..e13e0e5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SomeManagedBeanBase.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SomeManagedBeanBase.java
@@ -18,7 +18,7 @@
import jakarta.annotation.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import jakarta.annotation.Resource;
import javax.interceptor.Interceptors;
import org.omg.CORBA.ORB;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/client/Client.java
index 439be0e..b5bdc40 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/client/Client.java
@@ -19,7 +19,7 @@
import java.io.*;
import java.util.*;
import javax.naming.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
public class Client {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/BaseBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/BaseBean.java
index f47eb43..9a6d8d1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/BaseBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/BaseBean.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import javax.interceptor.*;
import java.lang.reflect.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SfulEJB.java
index 1ea47c0..0af939a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SfulEJB.java
@@ -21,7 +21,7 @@
import javax.interceptor.Interceptors;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SingletonBean.java
index ab34822..27bb0b0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SingletonBean.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import javax.interceptor.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SlessEJB.java
index 95391d2..c18e6ac 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SlessEJB.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.interceptor.*;
import jakarta.annotation.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SlessEJB2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SlessEJB2.java
index 94148fb..5b392da 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SlessEJB2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SlessEJB2.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import javax.interceptor.*;
import jakarta.annotation.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SlessEJB3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SlessEJB3.java
index 2ff2ac0..0373cde 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SlessEJB3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SlessEJB3.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.interceptor.*;
import jakarta.annotation.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/Snglt.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/Snglt.java
index e1983ce..32f548d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/Snglt.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/Snglt.java
@@ -16,7 +16,7 @@
package com.acme;
-@javax.ejb.Remote
+@jakarta.ejb.Remote
public interface Snglt {
public String hello();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/client/Client.java
index 439be0e..b5bdc40 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/client/Client.java
@@ -19,7 +19,7 @@
import java.io.*;
import java.util.*;
import javax.naming.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
public class Client {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/BaseBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/BaseBean.java
index 2183f83..4c82c2f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/BaseBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/BaseBean.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import javax.interceptor.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/SfulEJB.java
index 8024738..c353361 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/SfulEJB.java
@@ -21,7 +21,7 @@
import javax.interceptor.Interceptors;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/SingletonBean.java
index 42fb5f1..73560cc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/SingletonBean.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import javax.interceptor.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/SlessEJB.java
index 0503dee..288f81b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/SlessEJB.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import javax.interceptor.*;
import jakarta.annotation.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/Snglt.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/Snglt.java
index e1983ce..32f548d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/Snglt.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/Snglt.java
@@ -16,7 +16,7 @@
package com.acme;
-@javax.ejb.Remote
+@jakarta.ejb.Remote
public interface Snglt {
public String hello();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/client/Client.java
index db9f833..83fd073 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/client/Client.java
@@ -19,7 +19,7 @@
import java.io.*;
import java.util.*;
import javax.naming.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
public class Client {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/BaseBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/BaseBean.java
index b85cd87..3d9fd86 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/BaseBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/BaseBean.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import javax.interceptor.*;
import java.lang.reflect.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SfulEJB.java
index 7bdc0a3..a2550d1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SfulEJB.java
@@ -21,7 +21,7 @@
import javax.interceptor.Interceptors;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SingletonBean.java
index dc44dde..8a21559 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SingletonBean.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import javax.interceptor.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SlessEJB.java
index cb66ca0..18b48ce 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SlessEJB.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.interceptor.*;
import jakarta.annotation.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SlessEJB2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SlessEJB2.java
index c13d9aa..d418ee0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SlessEJB2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SlessEJB2.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import javax.interceptor.*;
import jakarta.annotation.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SlessEJB3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SlessEJB3.java
index 95a7ba8..c0f50c7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SlessEJB3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SlessEJB3.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.interceptor.*;
import jakarta.annotation.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/Snglt.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/Snglt.java
index e1983ce..32f548d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/Snglt.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/Snglt.java
@@ -16,7 +16,7 @@
package com.acme;
-@javax.ejb.Remote
+@jakarta.ejb.Remote
public interface Snglt {
public String hello();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean.java
index 9538786..b66e326 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean.java
@@ -18,7 +18,7 @@
import jakarta.annotation.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import jakarta.annotation.Resource;
import javax.interceptor.Interceptors;
import org.omg.CORBA.ORB;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean2.java
index 0e340d7..87f55cb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean2.java
@@ -18,7 +18,7 @@
import jakarta.annotation.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import jakarta.annotation.Resource;
import javax.interceptor.ExcludeClassInterceptors;
import javax.interceptor.Interceptors;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean3.java
index 1daebb1..3ca7de0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean3.java
@@ -18,7 +18,7 @@
import jakarta.annotation.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import jakarta.annotation.Resource;
import javax.interceptor.ExcludeClassInterceptors;
import javax.interceptor.Interceptors;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/client/Client.java
index db9f833..83fd073 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/client/Client.java
@@ -19,7 +19,7 @@
import java.io.*;
import java.util.*;
import javax.naming.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
public class Client {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/BaseBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/BaseBean.java
index f47eb43..9a6d8d1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/BaseBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/BaseBean.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import javax.interceptor.*;
import java.lang.reflect.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SfulEJB.java
index 4d57156..cc04f28 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SfulEJB.java
@@ -21,7 +21,7 @@
import javax.interceptor.Interceptors;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SingletonBean.java
index dfe71af..c3d5166 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SingletonBean.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import javax.interceptor.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SlessEJB.java
index 852a841..b61f44e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SlessEJB.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.interceptor.*;
import jakarta.annotation.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SlessEJB2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SlessEJB2.java
index 94148fb..5b392da 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SlessEJB2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SlessEJB2.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import javax.interceptor.*;
import jakarta.annotation.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SlessEJB3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SlessEJB3.java
index 16d3e9a..7c9aeaf 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SlessEJB3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SlessEJB3.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.interceptor.*;
import jakarta.annotation.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/Snglt.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/Snglt.java
index e1983ce..32f548d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/Snglt.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/Snglt.java
@@ -16,7 +16,7 @@
package com.acme;
-@javax.ejb.Remote
+@jakarta.ejb.Remote
public interface Snglt {
public String hello();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/client/Client.java
index 77f88ce..314d8e6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/client/Client.java
@@ -16,7 +16,7 @@
package client.intrfaces;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import admin.AdminBaseDevTest;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/NegEJB1.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/NegEJB1.java
index e934568..a932582 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/NegEJB1.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/NegEJB1.java
@@ -16,9 +16,9 @@
package ejb32.intrfaces;
-import javax.ejb.Local;
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
+import jakarta.ejb.Local;
+import jakarta.ejb.Remote;
+import jakarta.ejb.Stateless;
/*
St1 can not be both local and remote
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/NegEJB2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/NegEJB2.java
index cad3dd3..2b07663 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/NegEJB2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/NegEJB2.java
@@ -16,8 +16,8 @@
package ejb32.intrfaces;
-import javax.ejb.Local;
-import javax.ejb.Stateful;
+import jakarta.ejb.Local;
+import jakarta.ejb.Stateful;
/*
St7 can not be both local and remote
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/SingletonBean.java
index 3446aae..1bb55b3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/SingletonBean.java
@@ -16,7 +16,7 @@
package ejb32.intrfaces;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
/*
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/SingletonBean1.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/SingletonBean1.java
index af35fe1..32f43d3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/SingletonBean1.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/SingletonBean1.java
@@ -16,7 +16,7 @@
package ejb32.intrfaces;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
/*
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/St6.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/St6.java
index 1fdcf92..c4441a3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/St6.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/St6.java
@@ -16,7 +16,7 @@
package ejb32.intrfaces;
-@javax.ejb.Local
+@jakarta.ejb.Local
public interface St6 {
public String st6() throws Exception;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/St7.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/St7.java
index 4515a12..19dfa3c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/St7.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/St7.java
@@ -16,7 +16,7 @@
package ejb32.intrfaces;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface St7 {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/StflEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/StflEJB.java
index 880275a..87d8f6e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/StflEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/StflEJB.java
@@ -17,9 +17,9 @@
package ejb32.intrfaces;
import jakarta.annotation.Resource;
-import javax.ejb.EJB;
-import javax.ejb.SessionContext;
-import javax.ejb.Stateful;
+import jakarta.ejb.EJB;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.Stateful;
/*
StflEJB exposes remote interface St7. St5 isn't business interface.
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/StflEJB1.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/StflEJB1.java
index e0ea36a..52ef5e1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/StflEJB1.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/StflEJB1.java
@@ -20,7 +20,7 @@
StflEJB1 exposes local interfaces St4 & St3
*/
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
@Stateful
public class StflEJB1 implements St3, St4 {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/StflEJB2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/StflEJB2.java
index 6041ca0..2361aae 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/StflEJB2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/StflEJB2.java
@@ -16,8 +16,8 @@
package ejb32.intrfaces;
-import javax.ejb.Local;
-import javax.ejb.Stateful;
+import jakarta.ejb.Local;
+import jakarta.ejb.Stateful;
/*
StflEJB2 exposes local interfaces St4 and St6. St5 isn't business interface
*/
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/StlesEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/StlesEJB.java
index 45c0d13..40cbfb6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/StlesEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/StlesEJB.java
@@ -17,7 +17,7 @@
package ejb32.intrfaces;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NameNotFoundException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/StlesEJB1.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/StlesEJB1.java
index 39f4f57..89b563b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/StlesEJB1.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/StlesEJB1.java
@@ -16,8 +16,8 @@
package ejb32.intrfaces;
-import javax.ejb.LocalBean;
-import javax.ejb.Stateless;
+import jakarta.ejb.LocalBean;
+import jakarta.ejb.Stateless;
/*
StlesEJB1 exposes no-interface view, local interface St6, remote interface St7.
St5 isn't business interface
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/StlesEJB2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/StlesEJB2.java
index 6821cd1..56428c1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/StlesEJB2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/StlesEJB2.java
@@ -16,8 +16,8 @@
package ejb32.intrfaces;
-import javax.ejb.Local;
-import javax.ejb.Stateless;
+import jakarta.ejb.Local;
+import jakarta.ejb.Stateless;
/*
StlesEJB2 exposes remote interface St7. St3 isn't business interface
*/
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/mdb/ejb/ModernBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/mdb/ejb/ModernBean.java
index 8b3b11c..b6e7a64 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/mdb/ejb/ModernBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/mdb/ejb/ModernBean.java
@@ -20,9 +20,9 @@
import com.sun.s1asdev.ejb.ejb32.mdb.ra.CommandListener;
import jakarta.annotation.Resource;
-import javax.ejb.EJB;
-import javax.ejb.MessageDriven;
-import javax.ejb.MessageDrivenContext;
+import jakarta.ejb.EJB;
+import jakarta.ejb.MessageDriven;
+import jakarta.ejb.MessageDrivenContext;
import javax.interceptor.Interceptors;
/**
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/mdb/ejb/ResultsBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/mdb/ejb/ResultsBean.java
index 0236fd3..4622ee1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/mdb/ejb/ResultsBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/mdb/ejb/ResultsBean.java
@@ -16,10 +16,10 @@
package com.sun.s1asdev.ejb.ejb32.mdb.ejb;
-import javax.ejb.LocalBean;
-import javax.ejb.Lock;
-import javax.ejb.LockType;
-import javax.ejb.Singleton;
+import jakarta.ejb.LocalBean;
+import jakarta.ejb.Lock;
+import jakarta.ejb.LockType;
+import jakarta.ejb.Singleton;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CountDownLatch;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/mdb/ejb/ResultsRemote.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/mdb/ejb/ResultsRemote.java
index 77808c0..828f191 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/mdb/ejb/ResultsRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/mdb/ejb/ResultsRemote.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb32.mdb.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
import java.util.List;
/**
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/client/Client.java
index 1ed04fa..0f62d41 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/client/Client.java
@@ -16,7 +16,7 @@
package client.methodintf;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import ejb32.methodintf.St;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/ejb/SingletonBean.java
index 3591c06..080364b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/ejb/SingletonBean.java
@@ -16,7 +16,7 @@
package ejb32.methodintf;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.interceptor.*;
import jakarta.annotation.*;
import javax.naming.InitialContext;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/ejb/St.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/ejb/St.java
index 68b3623..8ec6ccd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/ejb/St.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/ejb/St.java
@@ -16,7 +16,7 @@
package ejb32.methodintf;
-@javax.ejb.Remote
+@jakarta.ejb.Remote
public interface St {
public void test() throws Exception;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/ejb/StfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/ejb/StfulEJB.java
index dd1033d..e404df1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/ejb/StfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/ejb/StfulEJB.java
@@ -16,7 +16,7 @@
package ejb32.methodintf;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.interceptor.*;
import jakarta.annotation.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/ejb/StlesEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/ejb/StlesEJB.java
index 04063cd..48b54ae 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/ejb/StlesEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/ejb/StlesEJB.java
@@ -16,7 +16,7 @@
package ejb32.methodintf;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.interceptor.*;
import jakarta.annotation.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/client/Client.java
index f8eb8ec..e3a0692 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/client/Client.java
@@ -19,7 +19,7 @@
import java.util.Map;
import java.util.Map.Entry;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
import com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.disallowed_methods.ejb.Tester;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/ejb/SlessBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/ejb/SlessBean.java
index 0b88816..ad2464c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/ejb/SlessBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/ejb/SlessBean.java
@@ -19,7 +19,7 @@
import java.util.HashMap;
import java.util.Map;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import javax.persistence.EntityManager;
import javax.persistence.LockModeType;
import javax.persistence.PersistenceContext;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/ejb/Tester.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/ejb/Tester.java
index 1f299a6..ca68878 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/ejb/Tester.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/ejb/Tester.java
@@ -18,7 +18,7 @@
import java.util.Map;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface Tester {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/client/Client.java
index 507fe8d..65a2abc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/client/Client.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.extendedscope_cross_sfsb.client;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
import com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.extendedscope_cross_sfsb.ejb.Tester;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC1Finder.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC1Finder.java
index 2a40a89..825aca4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC1Finder.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC1Finder.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.extendedscope_cross_sfsb.ejb;
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
public interface TC1Finder extends EJBLocalObject{
Person findPerson(String name);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC1FinderHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC1FinderHome.java
index de8610f..ec1d7ac 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC1FinderHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC1FinderHome.java
@@ -16,8 +16,8 @@
package com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.extendedscope_cross_sfsb.ejb;
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
public interface TC1FinderHome extends EJBLocalHome{
public TC1Finder createFinder() throws CreateException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC1SfsbWithSynchPC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC1SfsbWithSynchPC.java
index e027922..7b24a9e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC1SfsbWithSynchPC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC1SfsbWithSynchPC.java
@@ -16,9 +16,9 @@
package com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.extendedscope_cross_sfsb.ejb;
-import javax.ejb.Init;
-import javax.ejb.LocalHome;
-import javax.ejb.Stateful;
+import jakarta.ejb.Init;
+import jakarta.ejb.LocalHome;
+import jakarta.ejb.Stateful;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import javax.persistence.PersistenceContextType;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC1SfsbWithUnsynchPC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC1SfsbWithUnsynchPC.java
index 1096d45..ff14458 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC1SfsbWithUnsynchPC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC1SfsbWithUnsynchPC.java
@@ -16,9 +16,9 @@
package com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.extendedscope_cross_sfsb.ejb;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
-import javax.ejb.Stateful;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.Stateful;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import javax.persistence.PersistenceContextType;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC2Finder.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC2Finder.java
index 6b4b4e4..8f44efb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC2Finder.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC2Finder.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.extendedscope_cross_sfsb.ejb;
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
public interface TC2Finder extends EJBLocalObject{
Person findPerson(String name);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC2FinderHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC2FinderHome.java
index 3412751..b173883 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC2FinderHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC2FinderHome.java
@@ -16,8 +16,8 @@
package com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.extendedscope_cross_sfsb.ejb;
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
public interface TC2FinderHome extends EJBLocalHome{
public TC2Finder createFinder() throws CreateException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC2SfsbWithSynchPC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC2SfsbWithSynchPC.java
index 72a422e..d3c3080 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC2SfsbWithSynchPC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC2SfsbWithSynchPC.java
@@ -16,9 +16,9 @@
package com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.extendedscope_cross_sfsb.ejb;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
-import javax.ejb.Stateful;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.Stateful;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import javax.persistence.PersistenceContextType;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC2SfsbWithUnsynchPC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC2SfsbWithUnsynchPC.java
index 00035cd..41ae2a9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC2SfsbWithUnsynchPC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC2SfsbWithUnsynchPC.java
@@ -16,9 +16,9 @@
package com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.extendedscope_cross_sfsb.ejb;
-import javax.ejb.Init;
-import javax.ejb.LocalHome;
-import javax.ejb.Stateful;
+import jakarta.ejb.Init;
+import jakarta.ejb.LocalHome;
+import jakarta.ejb.Stateful;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import javax.persistence.PersistenceContextType;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/Tester.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/Tester.java
index c70aa27..3626c14 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/Tester.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/Tester.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.extendedscope_cross_sfsb.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface Tester {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/client/Client.java
index b015a2f..0af4cff 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/client/Client.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.rollback_notclear_unsynchPC.client;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
import com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.rollback_notclear_unsynchPC.ejb.Tester;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/ejb/SlessBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/ejb/SlessBean.java
index a35f3a2..8cf3554 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/ejb/SlessBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/ejb/SlessBean.java
@@ -16,9 +16,9 @@
package com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.rollback_notclear_unsynchPC.ejb;
-import javax.ejb.Stateless;
-import javax.ejb.TransactionManagement;
-import javax.ejb.TransactionManagementType;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.TransactionManagement;
+import jakarta.ejb.TransactionManagementType;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import javax.persistence.SynchronizationType;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/ejb/Tester.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/ejb/Tester.java
index 33d73e0..d5ffaf5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/ejb/Tester.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/ejb/Tester.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.rollback_notclear_unsynchPC.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface Tester {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/client/Client.java
index 26eb91e..0cc3be9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/client/Client.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.txscope_synctype_mismatch.client;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
import com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.txscope_synctype_mismatch.ejb.Tester;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/Finder.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/Finder.java
index 26dadb9..6346d47 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/Finder.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/Finder.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.txscope_synctype_mismatch.ejb;
-import javax.ejb.Local;
+import jakarta.ejb.Local;
@Local
public interface Finder {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/SlsbWithSynchPC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/SlsbWithSynchPC.java
index aba5364..22494e3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/SlsbWithSynchPC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/SlsbWithSynchPC.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.txscope_synctype_mismatch.ejb;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import javax.persistence.SynchronizationType;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC1SfsbWithUnsynchPC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC1SfsbWithUnsynchPC.java
index 68d3fb6..0ac7247 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC1SfsbWithUnsynchPC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC1SfsbWithUnsynchPC.java
@@ -16,9 +16,9 @@
package com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.txscope_synctype_mismatch.ejb;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
-import javax.ejb.Stateful;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.Stateful;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import javax.persistence.SynchronizationType;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC2SlsbWithUnsynchPC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC2SlsbWithUnsynchPC.java
index 772a88e..3c95c3b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC2SlsbWithUnsynchPC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC2SlsbWithUnsynchPC.java
@@ -16,9 +16,9 @@
package com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.txscope_synctype_mismatch.ejb;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
-import javax.ejb.Stateless;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.Stateless;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import javax.persistence.SynchronizationType;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC3SlsbWithSynchPC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC3SlsbWithSynchPC.java
index 41edfb5..ce84ab6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC3SlsbWithSynchPC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC3SlsbWithSynchPC.java
@@ -16,8 +16,8 @@
package com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.txscope_synctype_mismatch.ejb;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import javax.persistence.SynchronizationType;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC3SlsbWithUnSynchPC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC3SlsbWithUnSynchPC.java
index 6841193..bc127df 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC3SlsbWithUnSynchPC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC3SlsbWithUnSynchPC.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.txscope_synctype_mismatch.ejb;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import javax.persistence.SynchronizationType;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC4SfsbWithUnsynchPC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC4SfsbWithUnsynchPC.java
index 8eaf62a..78e943d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC4SfsbWithUnsynchPC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC4SfsbWithUnsynchPC.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.txscope_synctype_mismatch.ejb;
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import javax.persistence.SynchronizationType;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC4SlsbWithSynchPC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC4SlsbWithSynchPC.java
index 1f9e0d9..d35d203 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC4SlsbWithSynchPC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC4SlsbWithSynchPC.java
@@ -16,8 +16,8 @@
package com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.txscope_synctype_mismatch.ejb;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import javax.persistence.SynchronizationType;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/Tester.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/Tester.java
index 3a4ddb9..edf77d1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/Tester.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/Tester.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.txscope_synctype_mismatch.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface Tester {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/client/Client.java
index 1dc3c7c..6ed9ff8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/client/Client.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.unsynchpc_flush.client;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
import com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.unsynchpc_flush.ejb.Tester;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/ejb/SLSBWithUnsynchPC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/ejb/SLSBWithUnsynchPC.java
index 1b298b4..627eb63 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/ejb/SLSBWithUnsynchPC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/ejb/SLSBWithUnsynchPC.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.unsynchpc_flush.ejb;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import javax.persistence.SynchronizationType;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/ejb/Tester.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/ejb/Tester.java
index 5a78a4e..c3a048b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/ejb/Tester.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/ejb/Tester.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.unsynchpc_flush.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface Tester {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/client/Client.java
index 45377b1..5ade34f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/client/Client.java
@@ -19,7 +19,7 @@
import java.util.Map;
import java.util.Map.Entry;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
import com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.use_nonjtadatasource.ejb.Tester;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/ejb/SfulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/ejb/SfulBean.java
index 5e47414..26d6f50 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/ejb/SfulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/ejb/SfulBean.java
@@ -18,7 +18,7 @@
import java.util.Map;
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import javax.persistence.PersistenceContextType;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/ejb/SlessBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/ejb/SlessBean.java
index 2a16f09..d2bc8ee 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/ejb/SlessBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/ejb/SlessBean.java
@@ -21,11 +21,11 @@
import java.util.HashMap;
import java.util.Map;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
-import javax.ejb.Stateless;
-import javax.ejb.TransactionManagement;
-import javax.ejb.TransactionManagementType;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.TransactionManagement;
+import jakarta.ejb.TransactionManagementType;
import javax.naming.InitialContext;
import javax.sql.DataSource;
import javax.transaction.UserTransaction;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/ejb/Tester.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/ejb/Tester.java
index 809b883..082f8f7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/ejb/Tester.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/ejb/Tester.java
@@ -18,7 +18,7 @@
import java.util.Map;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface Tester {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/client/Client.java
index a564a67..e75bfb7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/client/Client.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import javax.naming.InitialContext;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/Hello.java
index 1893d25..90f930f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/Hello.java
@@ -16,7 +16,7 @@
package com.acme;
-@javax.ejb.Remote
+@jakarta.ejb.Remote
public interface Hello {
String test(String value, int count);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/Hello2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/Hello2.java
index 97aa3b4..906b75f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/Hello2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/Hello2.java
@@ -16,7 +16,7 @@
package com.acme;
-@javax.ejb.Remote
+@jakarta.ejb.Remote
public interface Hello2 {
void testRemove();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/SFSB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/SFSB.java
index 783872c..0f41ca6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/SFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/SFSB.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.persistence.*;
import jakarta.annotation.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/SLSB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/SLSB.java
index fba93b5..9df1d86 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/SLSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/SLSB.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
@Stateless
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/client/Client.java
index 96879ec..b09b63f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/client/Client.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import javax.naming.InitialContext;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/ejb/SFSB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/ejb/SFSB.java
index d6926f6..a99a8f6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/ejb/SFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/ejb/SFSB.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.persistence.*;
import jakarta.annotation.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/client/Client.java
index f00aacd..5bfa4db 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/client/Client.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import javax.naming.InitialContext;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/Hello.java
index 8c9728b..4ff2e67 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/Hello.java
@@ -16,7 +16,7 @@
package com.acme;
-@javax.ejb.Remote
+@jakarta.ejb.Remote
public interface Hello {
String test();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/Hello1.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/Hello1.java
index 387b640..946f600 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/Hello1.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/Hello1.java
@@ -16,7 +16,7 @@
package com.acme;
-@javax.ejb.Remote
+@jakarta.ejb.Remote
public interface Hello1 {
String test();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/Hello2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/Hello2.java
index 16e0fa6..77d1ee6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/Hello2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/Hello2.java
@@ -16,7 +16,7 @@
package com.acme;
-@javax.ejb.Remote
+@jakarta.ejb.Remote
public interface Hello2 {
String test();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB.java
index be13c49..6d6dffd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.persistence.*;
import jakarta.annotation.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB1.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB1.java
index 22f4216..b0c8bcc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB1.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB1.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.persistence.*;
import jakarta.annotation.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB2.java
index d0172f5..4b21f22 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB2.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.persistence.*;
import jakarta.annotation.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/client/Client.java
index 20aa4e3..e39c707 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/client/Client.java
@@ -16,7 +16,7 @@
package com.acme.ejb32.timer.getalltimers;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/ejb/SingletonTimeoutEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/ejb/SingletonTimeoutEJB.java
index a5d446e..630fc3e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/ejb/SingletonTimeoutEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/ejb/SingletonTimeoutEJB.java
@@ -17,15 +17,15 @@
package com.acme.ejb32.timer.getalltimers;
import jakarta.annotation.Resource;
-import javax.ejb.Schedule;
-import javax.ejb.Schedules;
-import javax.ejb.Singleton;
-import javax.ejb.Timeout;
-import javax.ejb.Timer;
-import javax.ejb.TimerConfig;
-import javax.ejb.TimerService;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.Schedule;
+import jakarta.ejb.Schedules;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Timeout;
+import jakarta.ejb.Timer;
+import jakarta.ejb.TimerConfig;
+import jakarta.ejb.TimerService;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
@Singleton
public class SingletonTimeoutEJB {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/ejb/StlesNonTimeout.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/ejb/StlesNonTimeout.java
index 85e083a..64d8b1a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/ejb/StlesNonTimeout.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/ejb/StlesNonTimeout.java
@@ -16,7 +16,7 @@
package com.acme.ejb32.timer.getalltimers;
-@javax.ejb.Remote
+@jakarta.ejb.Remote
public interface StlesNonTimeout {
public void verifyAllTimers() throws Exception;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/ejb/StlesNonTimeoutEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/ejb/StlesNonTimeoutEJB.java
index 89e1c89..a0f64f0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/ejb/StlesNonTimeoutEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/ejb/StlesNonTimeoutEJB.java
@@ -16,7 +16,7 @@
package com.acme.ejb32.timer.getalltimers;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.Resource;
import java.util.Set;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/ejb/StlesTimeout.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/ejb/StlesTimeout.java
index 9ec0e0c..3b84657 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/ejb/StlesTimeout.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/ejb/StlesTimeout.java
@@ -16,7 +16,7 @@
package com.acme.ejb32.timer.getalltimers;
-@javax.ejb.Remote
+@jakarta.ejb.Remote
public interface StlesTimeout {
public void createProgrammaticTimers();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/ejb/StlesTimeoutEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/ejb/StlesTimeoutEJB.java
index 6cf278c..fb784ae 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/ejb/StlesTimeoutEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/ejb/StlesTimeoutEJB.java
@@ -16,7 +16,7 @@
package com.acme.ejb32.timer.getalltimers;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.Resource;
import java.util.Map;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/client/Client.java
index 34df051..b6dca0b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/client/Client.java
@@ -17,7 +17,7 @@
package com.acme.ejb32.timer.opallowed;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/ejb/SingletonTimeout.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/ejb/SingletonTimeout.java
index ba95660..f76b1a3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/ejb/SingletonTimeout.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/ejb/SingletonTimeout.java
@@ -16,9 +16,9 @@
package com.acme.ejb32.timer.opallowed;
-import javax.ejb.Remote;
-import javax.ejb.Timer;
-import javax.ejb.TimerHandle;
+import jakarta.ejb.Remote;
+import jakarta.ejb.Timer;
+import jakarta.ejb.TimerHandle;
@Remote
public interface SingletonTimeout {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/ejb/SingletonTimeoutEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/ejb/SingletonTimeoutEJB.java
index 57369b6..045234c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/ejb/SingletonTimeoutEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/ejb/SingletonTimeoutEJB.java
@@ -17,15 +17,15 @@
package com.acme.ejb32.timer.opallowed;
import jakarta.annotation.Resource;
-import javax.ejb.Schedule;
-import javax.ejb.ScheduleExpression;
-import javax.ejb.Schedules;
-import javax.ejb.Singleton;
-import javax.ejb.Timeout;
-import javax.ejb.Timer;
-import javax.ejb.TimerConfig;
-import javax.ejb.TimerHandle;
-import javax.ejb.TimerService;
+import jakarta.ejb.Schedule;
+import jakarta.ejb.ScheduleExpression;
+import jakarta.ejb.Schedules;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Timeout;
+import jakarta.ejb.Timer;
+import jakarta.ejb.TimerConfig;
+import jakarta.ejb.TimerHandle;
+import jakarta.ejb.TimerService;
@Singleton
public class SingletonTimeoutEJB implements SingletonTimeoutLocal, SingletonTimeout {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/ejb/SingletonTimeoutLocal.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/ejb/SingletonTimeoutLocal.java
index 0e3721b..cd9a51d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/ejb/SingletonTimeoutLocal.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/ejb/SingletonTimeoutLocal.java
@@ -16,9 +16,9 @@
package com.acme.ejb32.timer.opallowed;
-import javax.ejb.Local;
-import javax.ejb.Timer;
-import javax.ejb.TimerHandle;
+import jakarta.ejb.Local;
+import jakarta.ejb.Timer;
+import jakarta.ejb.TimerHandle;
@Local
public interface SingletonTimeoutLocal {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/ejb/TimeoutHelper.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/ejb/TimeoutHelper.java
index 95ef656..42997e6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/ejb/TimeoutHelper.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/ejb/TimeoutHelper.java
@@ -16,8 +16,8 @@
package com.acme.ejb32.timer.opallowed;
-import javax.ejb.Timer;
-import javax.ejb.TimerHandle;
+import jakarta.ejb.Timer;
+import jakarta.ejb.TimerHandle;
public class TimeoutHelper {
// this is to test the APIs allowed to be invoked
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/war/MngTimeoutBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/war/MngTimeoutBean.java
index 3fc835d..70a73a6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/war/MngTimeoutBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/war/MngTimeoutBean.java
@@ -17,9 +17,9 @@
package com.acme.ejb32.timer.opallowed;
import jakarta.annotation.ManagedBean;
-import javax.ejb.EJB;
-import javax.ejb.Timer;
-import javax.ejb.TimerHandle;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Timer;
+import jakarta.ejb.TimerHandle;
@ManagedBean("MngBean")
public class MngTimeoutBean {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/war/VerifyServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/war/VerifyServlet.java
index fad6e53..bec561a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/war/VerifyServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/war/VerifyServlet.java
@@ -17,11 +17,11 @@
package com.acme.ejb32.timer.opallowed;
import jakarta.annotation.Resource;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import java.io.IOException;
import java.io.PrintWriter;
-import javax.ejb.Timer;
-import javax.ejb.TimerHandle;
+import jakarta.ejb.Timer;
+import jakarta.ejb.TimerHandle;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/client/Client.java
index 6136fa3..397a553 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/client/Client.java
@@ -18,7 +18,7 @@
import java.io.*;
import java.util.*;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
import javax.naming.*;
import javax.rmi.PortableRemoteObject;
import org.omg.CORBA.ORB;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/Foo.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/Foo.java
index 14680e5..8f1c9d2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/Foo.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/Foo.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejbc.equals;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.Remote;
import java.rmi.RemoteException;
import java.io.Serializable;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooBean.java
index 2dc6d86..555fe48 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooBean.java
@@ -19,9 +19,9 @@
import java.util.Enumeration;
import java.io.Serializable;
import java.rmi.RemoteException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
import javax.naming.*;
import javax.rmi.PortableRemoteObject;
@@ -165,7 +165,7 @@
try {
cont.assertValidRemoteObject(sc.getEJBObject());
System.out.println("Assertion of my ejb object succeeded");
- } catch(javax.ejb.EJBException e) {
+ } catch(jakarta.ejb.EJBException e) {
e.printStackTrace();
throw e;
}
@@ -173,42 +173,42 @@
try {
cont.assertValidRemoteObject(null);
throw new EJBException("assertion should have failed");
- } catch(javax.ejb.EJBException e) {
+ } catch(jakarta.ejb.EJBException e) {
System.out.println("Successfully caught the following exception:" + e.getMessage());
}
try {
cont.assertValidRemoteObject(this);
throw new EJBException("assertion should have failed");
- } catch(javax.ejb.EJBException e) {
+ } catch(jakarta.ejb.EJBException e) {
System.out.println("Successfully caught the following exception:" + e.getMessage());
}
try {
cont.assertValidRemoteObject(home);
throw new EJBException("assertion should have failed");
- } catch(javax.ejb.EJBException e) {
+ } catch(jakarta.ejb.EJBException e) {
System.out.println("Successfully caught the following exception:" + e.getMessage());
}
try {
cont.assertValidRemoteObject(hr);
throw new EJBException("assertion should have failed");
- } catch(javax.ejb.EJBException e) {
+ } catch(jakarta.ejb.EJBException e) {
System.out.println("Successfully caught the following exception:" + e.getMessage());
}
try {
cont.assertValidRemoteObject(hr2);
throw new EJBException("assertion should have failed");
- } catch(javax.ejb.EJBException e) {
+ } catch(jakarta.ejb.EJBException e) {
System.out.println("Successfully caught the following exception:" + e.getMessage());
}
try {
cont.assertValidRemoteObject(meLocal);
throw new EJBException("assertion should have failed");
- } catch(javax.ejb.EJBException e) {
+ } catch(jakarta.ejb.EJBException e) {
System.out.println("Successfully caught the following exception:" + e.getMessage());
}
@@ -219,7 +219,7 @@
try {
cont.assertValidLocalObject(meLocal);
System.out.println("Assertion of my ejb local object succeeded");
- } catch(javax.ejb.EJBException e) {
+ } catch(jakarta.ejb.EJBException e) {
e.printStackTrace();
throw e;
}
@@ -227,42 +227,42 @@
try {
cont.assertValidLocalObject(null);
throw new EJBException("assertion should have failed");
- } catch(javax.ejb.EJBException e) {
+ } catch(jakarta.ejb.EJBException e) {
System.out.println("Successfully caught the following exception:" + e.getMessage());
}
try {
cont.assertValidLocalObject(hl);
throw new EJBException("assertion should have failed");
- } catch(javax.ejb.EJBException e) {
+ } catch(jakarta.ejb.EJBException e) {
System.out.println("Successfully caught the following exception:" + e.getMessage());
}
try {
cont.assertValidLocalObject(hl2);
throw new EJBException("assertion should have failed");
- } catch(javax.ejb.EJBException e) {
+ } catch(jakarta.ejb.EJBException e) {
System.out.println("Successfully caught the following exception:" + e.getMessage());
}
try {
cont.assertValidLocalObject(this);
throw new EJBException("assertion should have failed");
- } catch(javax.ejb.EJBException e) {
+ } catch(jakarta.ejb.EJBException e) {
System.out.println("Successfully caught the following exception:" + e.getMessage());
}
try {
cont.assertValidLocalObject(home);
throw new EJBException("assertion should have failed");
- } catch(javax.ejb.EJBException e) {
+ } catch(jakarta.ejb.EJBException e) {
System.out.println("Successfully caught the following exception:" + e.getMessage());
}
try {
cont.assertValidLocalObject(hr2);
throw new EJBException("assertion should have failed");
- } catch(javax.ejb.EJBException e) {
+ } catch(jakarta.ejb.EJBException e) {
System.out.println("Successfully caught the following exception:" + e.getMessage());
System.out.println("Successfully detected invalid ejb local object");
}
@@ -327,7 +327,7 @@
try {
cont.assertValidRemoteObject(sc.getEJBObject());
System.out.println("assertValidRemoteObject: Successfully compared (ejbo1 == ejo1)");
- } catch(javax.ejb.EJBException e) {
+ } catch(jakarta.ejb.EJBException e) {
e.printStackTrace();
System.out.println("assertValidRemoteObject: Failed (ejbo1 == ejbo1)");
return "Failed same EJBObject assert: " + e;
@@ -338,7 +338,7 @@
String str = "Comparison of (ejbo and home) should have failed";
System.out.println(str);
return str;
- } catch(javax.ejb.EJBException e) {
+ } catch(jakarta.ejb.EJBException e) {
System.out.println("assertValidRemoteObject: Successfully caught expected exception:" + e.getMessage());
}
@@ -347,7 +347,7 @@
String str = "Comparison of (ejbo and null) should have failed";
System.out.println(str);
return str;
- } catch(javax.ejb.EJBException e) {
+ } catch(jakarta.ejb.EJBException e) {
System.out.println("assertValidRemoteObject: Successfully caught expected exception:" + e.getMessage());
}
@@ -356,7 +356,7 @@
String str = "Comparison of (ejbo and bean) should have failed";
System.out.println(str);
return str;
- } catch(javax.ejb.EJBException e) {
+ } catch(jakarta.ejb.EJBException e) {
System.out.println("assertValidRemoteObject: Successfully caught expected exception:" + e.getMessage());
}
@@ -365,7 +365,7 @@
String str = "Comparison of (ejbo and ejbo_from_diff_container) should have failed";
System.out.println(str);
return str;
- } catch(javax.ejb.EJBException e) {
+ } catch(jakarta.ejb.EJBException e) {
System.out.println("assertValidRemoteObject: Successfully caught expected exception:" + e.getMessage());
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooHome.java
index ef82fd1..e69dadc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooHome.java
@@ -19,8 +19,8 @@
import java.io.Serializable;
import java.rmi.Remote;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface FooHome extends EJBHome, FooHomeSuper, FooHomeSuperOther {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooHomeSuperOther.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooHomeSuperOther.java
index 0c6e5fd..b978ffb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooHomeSuperOther.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooHomeSuperOther.java
@@ -20,5 +20,5 @@
import java.rmi.RemoteException;
public interface FooHomeSuperOther extends java.rmi.Remote {
- Foo create() throws RemoteException, javax.ejb.CreateException;
+ Foo create() throws RemoteException, jakarta.ejb.CreateException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooLocal.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooLocal.java
index 7e84b4e..f81a041 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooLocal.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooLocal.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejbc.equals;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface FooLocal extends EJBLocalObject {
void callHello();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooLocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooLocalHome.java
index 7e31051..228b9d6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooLocalHome.java
@@ -16,8 +16,8 @@
package com.sun.s1asdev.ejb.ejbc.equals;
-import javax.ejb.EJBLocalHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
public interface FooLocalHome extends EJBLocalHome {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooSuper.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooSuper.java
index ed6975a..73846a4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooSuper.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooSuper.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejbc.equals;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.Remote;
import java.rmi.RemoteException;
import java.io.Serializable;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/Hello.java
index ecb388d..b4eb94f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/Hello.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejbc.equals;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.Remote;
import java.rmi.RemoteException;
import java.io.Serializable;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/HelloHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/HelloHome.java
index 6023e81..31b8f2b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/HelloHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/HelloHome.java
@@ -19,10 +19,10 @@
import java.io.Serializable;
import java.rmi.Remote;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface HelloHome extends EJBHome {
- Hello create () throws RemoteException, javax.ejb.FinderException, CreateException;
+ Hello create () throws RemoteException, jakarta.ejb.FinderException, CreateException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/HelloLocal.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/HelloLocal.java
index 0a9fab0..a9762d6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/HelloLocal.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/HelloLocal.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejbc.equals;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface HelloLocal extends EJBLocalObject {
void callHello();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/HelloLocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/HelloLocalHome.java
index cbcf141..d447dd0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/HelloLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/HelloLocalHome.java
@@ -16,8 +16,8 @@
package com.sun.s1asdev.ejb.ejbc.equals;
-import javax.ejb.EJBLocalHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
public interface HelloLocalHome extends EJBLocalHome {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/client/Client.java
index ea1726c..4a8ce18 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/client/Client.java
@@ -18,7 +18,7 @@
import java.io.*;
import java.util.*;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
import javax.naming.*;
import javax.rmi.PortableRemoteObject;
import org.omg.CORBA.ORB;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/Foo.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/Foo.java
index 4d8ace0..2500192 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/Foo.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/Foo.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejbc.redef;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.Remote;
import java.rmi.RemoteException;
import java.io.Serializable;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooBean.java
index 8bc528f..71580c9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooBean.java
@@ -19,9 +19,9 @@
import java.util.Enumeration;
import java.io.Serializable;
import java.rmi.RemoteException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
import javax.naming.*;
import javax.rmi.PortableRemoteObject;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooHome.java
index 593f5af..a91a9dc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooHome.java
@@ -19,7 +19,7 @@
import java.io.Serializable;
import java.rmi.Remote;
import java.rmi.RemoteException;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface FooHome extends EJBHome, FooHomeSuper {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooHomeSuper.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooHomeSuper.java
index e6a9c6c..eb0530c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooHomeSuper.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooHomeSuper.java
@@ -19,7 +19,7 @@
import java.io.Serializable;
import java.rmi.Remote;
import java.rmi.RemoteException;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface FooHomeSuper extends Remote {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooLocal.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooLocal.java
index f89cc7f..acc621b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooLocal.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooLocal.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejbc.redef;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface FooLocal extends FooLocalSuper {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooLocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooLocalHome.java
index e5e201e..5e336ec 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooLocalHome.java
@@ -16,9 +16,9 @@
package com.sun.s1asdev.ejb.ejbc.redef;
-import javax.ejb.EJBLocalHome;
-import javax.ejb.CreateException;
-import javax.ejb.RemoveException;
+import jakarta.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.RemoveException;
public interface FooLocalHome extends EJBLocalHome, FooLocalHomeSuper {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooLocalHomeSuper.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooLocalHomeSuper.java
index efd394a..c3ced4a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooLocalHomeSuper.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooLocalHomeSuper.java
@@ -16,9 +16,9 @@
package com.sun.s1asdev.ejb.ejbc.redef;
-import javax.ejb.EJBLocalHome;
-import javax.ejb.CreateException;
-import javax.ejb.RemoveException;
+import jakarta.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.RemoveException;
public interface FooLocalHomeSuper {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooLocalSuper.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooLocalSuper.java
index 67ae541..df2e11c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooLocalSuper.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooLocalSuper.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejbc.redef;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface FooLocalSuper extends EJBLocalObject {
void callHello();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooSuper.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooSuper.java
index b91c260..4f5ab8a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooSuper.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooSuper.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejbc.redef;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.Remote;
import java.rmi.RemoteException;
import java.io.Serializable;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/Hello.java
index 6bdcee0..3aebfcd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/Hello.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejbc.sameimpl;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.Remote;
import java.rmi.RemoteException;
import java.io.Serializable;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/HelloHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/HelloHome.java
index 0128ee4..875ce34 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/HelloHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/HelloHome.java
@@ -19,8 +19,8 @@
import java.io.Serializable;
import java.rmi.Remote;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface HelloHome extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/HelloLocal.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/HelloLocal.java
index a3b53fa..d82be52 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/HelloLocal.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/HelloLocal.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejbc.sameimpl;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface HelloLocal extends EJBLocalObject {
void callHello();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/HelloLocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/HelloLocalHome.java
index 30622cb..f0f2c31 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/HelloLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/HelloLocalHome.java
@@ -16,8 +16,8 @@
package com.sun.s1asdev.ejb.ejbc.sameimpl;
-import javax.ejb.EJBLocalHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
public interface HelloLocalHome extends EJBLocalHome {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/client/Client.java
index 25c6ff7..9b5f3e8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/client/Client.java
@@ -18,7 +18,7 @@
import java.io.*;
import java.util.*;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
import javax.naming.*;
import javax.rmi.PortableRemoteObject;
import org.omg.CORBA.ORB;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/Foo.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/Foo.java
index e069286..8ef4603 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/Foo.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/Foo.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejbc.sameimpl;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.Remote;
import java.rmi.RemoteException;
import java.io.Serializable;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/FooBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/FooBean.java
index 159c476..4b705ee 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/FooBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/FooBean.java
@@ -19,9 +19,9 @@
import java.util.Enumeration;
import java.io.Serializable;
import java.rmi.RemoteException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
import javax.naming.*;
import javax.rmi.PortableRemoteObject;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/FooHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/FooHome.java
index f633974..9560e43 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/FooHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/FooHome.java
@@ -19,8 +19,8 @@
import java.io.Serializable;
import java.rmi.Remote;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface FooHome extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/FooLocal.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/FooLocal.java
index dbb0c09..0de3813 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/FooLocal.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/FooLocal.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejbc.sameimpl;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface FooLocal extends EJBLocalObject {
void callHello();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/FooLocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/FooLocalHome.java
index e11c3b3..32f200e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/FooLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/FooLocalHome.java
@@ -16,8 +16,8 @@
package com.sun.s1asdev.ejb.ejbc.sameimpl;
-import javax.ejb.EJBLocalHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
public interface FooLocalHome extends EJBLocalHome {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/Hello.java
index 6bdcee0..3aebfcd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/Hello.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejbc.sameimpl;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.Remote;
import java.rmi.RemoteException;
import java.io.Serializable;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/HelloHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/HelloHome.java
index 0128ee4..875ce34 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/HelloHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/HelloHome.java
@@ -19,8 +19,8 @@
import java.io.Serializable;
import java.rmi.Remote;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface HelloHome extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/HelloLocal.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/HelloLocal.java
index a3b53fa..d82be52 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/HelloLocal.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/HelloLocal.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejbc.sameimpl;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface HelloLocal extends EJBLocalObject {
void callHello();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/HelloLocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/HelloLocalHome.java
index 30622cb..f0f2c31 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/HelloLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/HelloLocalHome.java
@@ -16,8 +16,8 @@
package com.sun.s1asdev.ejb.ejbc.sameimpl;
-import javax.ejb.EJBLocalHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
public interface HelloLocalHome extends EJBLocalHome {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/ejb/Hello.java
index 3858e28..ee94000 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/ejb/Hello.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.jms.jmsejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.Remote;
import java.rmi.RemoteException;
import java.io.Serializable;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/ejb/HelloBean.java b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/ejb/HelloBean.java
index f3ad6a9..7e7f4d6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/ejb/HelloBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/ejb/HelloBean.java
@@ -17,9 +17,9 @@
package com.sun.s1asdev.ejb.jms.jmsejb;
import java.rmi.RemoteException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
import javax.naming.*;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/ejb/HelloHome.java b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/ejb/HelloHome.java
index 9dd444d..8bc6629 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/ejb/HelloHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/ejb/HelloHome.java
@@ -19,8 +19,8 @@
import java.io.Serializable;
import java.rmi.Remote;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface HelloHome extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/ejb/Hello.java
index ab80247..ea6600e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/ejb/Hello.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.jms.jmsejb2;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.Remote;
import java.rmi.RemoteException;
import java.io.Serializable;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/ejb/HelloBean.java b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/ejb/HelloBean.java
index d8522bd..20aeeeb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/ejb/HelloBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/ejb/HelloBean.java
@@ -17,9 +17,9 @@
package com.sun.s1asdev.ejb.jms.jmsejb2;
import java.rmi.RemoteException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
import javax.naming.*;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/ejb/HelloHome.java b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/ejb/HelloHome.java
index 5dfa4b5..d11da37 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/ejb/HelloHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/ejb/HelloHome.java
@@ -19,8 +19,8 @@
import java.io.Serializable;
import java.rmi.Remote;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface HelloHome extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/client/Client.java
index 5c42b13..ec031e0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/client/Client.java
@@ -18,7 +18,7 @@
import java.io.*;
import java.util.*;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
import javax.naming.*;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/ejb/MessageBean.java b/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/ejb/MessageBean.java
index 7f3c36f..0154e22 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/ejb/MessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/ejb/MessageBean.java
@@ -18,7 +18,7 @@
import java.rmi.RemoteException;
import jakarta.jms.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
public class MessageBean
diff --git a/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/ejb/MsgBean.java b/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/ejb/MsgBean.java
index 7daac5a..59da90d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/ejb/MsgBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/ejb/MsgBean.java
@@ -17,9 +17,9 @@
package com.sun.s1asdev.ejb.mdb.msgbean;
import java.util.Vector;
-import javax.ejb.EJBException;
-import javax.ejb.MessageDrivenBean;
-import javax.ejb.MessageDrivenContext;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.MessageDrivenBean;
+import jakarta.ejb.MessageDrivenContext;
import javax.naming.*;
import jakarta.jms.*;
import java.sql.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/ejb/OperationTest.java b/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/ejb/OperationTest.java
index 39a6701..6feac86 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/ejb/OperationTest.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/ejb/OperationTest.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.mdb.msgbean;
-import javax.ejb.MessageDrivenContext;
+import jakarta.ejb.MessageDrivenContext;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.transaction.UserTransaction;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/ejb/OperationTestMsgBean.java b/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/ejb/OperationTestMsgBean.java
index c790707..9ddef0e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/ejb/OperationTestMsgBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/ejb/OperationTestMsgBean.java
@@ -16,8 +16,8 @@
package com.sun.s1asdev.ejb.mdb.msgbean;
-import javax.ejb.MessageDrivenBean;
-import javax.ejb.MessageDrivenContext;
+import jakarta.ejb.MessageDrivenBean;
+import jakarta.ejb.MessageDrivenContext;
import jakarta.jms.Message;
import jakarta.jms.MessageListener;
import javax.naming.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/client/Client.java
index 4422a9b..c918e9b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/client/Client.java
@@ -20,7 +20,7 @@
import javax.naming.*;
import jakarta.jms.*;
import jakarta.annotation.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import com.sun.s1asdev.ejb.mdb.singleton.FooRemoteIF;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/ejb/FooBean.java b/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/ejb/FooBean.java
index ea94418..d16033d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/ejb/FooBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/ejb/FooBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.mdb.singleton;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.util.*;
@Stateless
diff --git a/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/ejb/FooRemoteIF.java b/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/ejb/FooRemoteIF.java
index 651cf36..2e5aba4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/ejb/FooRemoteIF.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/ejb/FooRemoteIF.java
@@ -16,10 +16,10 @@
package com.sun.s1asdev.ejb.mdb.singleton;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.util.*;
-@javax.ejb.Remote
+@jakarta.ejb.Remote
public interface FooRemoteIF {
public String foo();
public List<String> getMessageBeanInstances();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/ejb/MessageBean.java b/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/ejb/MessageBean.java
index 3b40a7f..b9b67c3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/ejb/MessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/ejb/MessageBean.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb.mdb.singleton;
import jakarta.jms.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
public class MessageBean implements MessageListener {
@EJB
diff --git a/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/ejb/StatusBean.java b/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/ejb/StatusBean.java
index 8b9d0bd..94c5266 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/ejb/StatusBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/ejb/StatusBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.mdb.singleton;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.util.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local/client/Client.java
index c68e346..46ada94 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local/client/Client.java
@@ -18,7 +18,7 @@
import java.io.*;
import java.util.*;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
import javax.naming.*;
import javax.rmi.PortableRemoteObject;
import org.omg.CORBA.ORB;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/Bmp.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/Bmp.java
index 9986972..1a03b7d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/Bmp.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/Bmp.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.perf.local;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface Bmp extends Common
{}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/BmpEJB.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/BmpEJB.java
index 2d4fa41..cbc28cc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/BmpEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/BmpEJB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.perf.local;
-import javax.ejb.*;
+import jakarta.ejb.*;
public class BmpEJB implements EntityBean
{
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/BmpHome.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/BmpHome.java
index 5a7577b..3688d01 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/BmpHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/BmpHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.perf.local;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface BmpHome extends EJBLocalHome
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/BmpRemote.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/BmpRemote.java
index 2000386..90d2605 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/BmpRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/BmpRemote.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.perf.local;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
public interface BmpRemote extends CommonRemote
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/BmpRemoteHome.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/BmpRemoteHome.java
index 28fadc7..5dec60c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/BmpRemoteHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/BmpRemoteHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.perf.local;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
public interface BmpRemoteHome extends EJBHome
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/Common.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/Common.java
index c6c8338..e3b7efa 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/Common.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/Common.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.perf.local;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface Common extends EJBLocalObject
{
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/CommonRemote.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/CommonRemote.java
index 3c3a4e4..1828cef 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/CommonRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/CommonRemote.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.perf.local;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
public interface CommonRemote extends EJBObject
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/Hello.java
index 2dd71b8..c3f8fa3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/Hello.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.perf.local;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
public interface Hello extends EJBObject
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/HelloEJB.java
index 493f5e0..5a8aac5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/HelloEJB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.perf.local;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import java.util.*;
import javax.rmi.PortableRemoteObject;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/HelloHome.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/HelloHome.java
index c32f970..99388a3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/HelloHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/HelloHome.java
@@ -19,8 +19,8 @@
import java.io.Serializable;
import java.rmi.Remote;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface HelloHome extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/Sful.java
index dc16e0a..81a564d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/Sful.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.perf.local;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface Sful extends Common
{}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SfulEJB.java
index bbda07a..bdb44b1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SfulEJB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.perf.local;
-import javax.ejb.*;
+import jakarta.ejb.*;
public class SfulEJB implements SessionBean
{
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SfulHome.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SfulHome.java
index 31138cf..1ff286d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SfulHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SfulHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.perf.local;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface SfulHome extends EJBLocalHome
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SfulRemote.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SfulRemote.java
index 80901a1..ebc5320 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SfulRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SfulRemote.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.perf.local;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface SfulRemote extends CommonRemote
{}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SfulRemoteHome.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SfulRemoteHome.java
index a429d9e..d3a76b4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SfulRemoteHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SfulRemoteHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.perf.local;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
public interface SfulRemoteHome extends EJBHome
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/Sless.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/Sless.java
index 2e01c9e..33d3f21 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/Sless.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.perf.local;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface Sless extends Common
{}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SlessEJB.java
index 0fc8208..cf5b7d0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SlessEJB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.perf.local;
-import javax.ejb.*;
+import jakarta.ejb.*;
public class SlessEJB implements SessionBean
{
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SlessHome.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SlessHome.java
index 24447e2..80dd1b8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SlessHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SlessHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.perf.local;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface SlessHome extends EJBLocalHome
{
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SlessRemote.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SlessRemote.java
index d99cb78..389ecbf 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SlessRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SlessRemote.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.perf.local;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface SlessRemote extends CommonRemote
{}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SlessRemoteHome.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SlessRemoteHome.java
index 61b84f9..b8c518e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SlessRemoteHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SlessRemoteHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.perf.local;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
public interface SlessRemoteHome extends EJBHome
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/client/Client.java
index c1b1c57..3805e03 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/client/Client.java
@@ -18,7 +18,7 @@
import java.io.*;
import java.util.*;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
import javax.naming.*;
import javax.rmi.PortableRemoteObject;
import org.omg.CORBA.ORB;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/Bmp.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/Bmp.java
index 9c92e70..7d9cb0c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/Bmp.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/Bmp.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.perf.local2;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface Bmp extends Common
{}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/BmpEJB.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/BmpEJB.java
index 3d347f1..2183b29 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/BmpEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/BmpEJB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.perf.local2;
-import javax.ejb.*;
+import jakarta.ejb.*;
public class BmpEJB implements EntityBean
{
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/BmpHome.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/BmpHome.java
index 6afa58c..b116406 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/BmpHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/BmpHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.perf.local2;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface BmpHome extends EJBLocalHome
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/Common.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/Common.java
index 18e13f4..d7d92d3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/Common.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/Common.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.perf.local2;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface Common extends EJBLocalObject
{
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/Hello.java
index f1e5bec..790534b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/Hello.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.perf.local2;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
public interface Hello extends EJBObject
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/HelloEJB.java
index 532377f..2c8ccc9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/HelloEJB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.perf.local2;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import java.util.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/HelloHome.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/HelloHome.java
index 1f38bec..c8769f8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/HelloHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/HelloHome.java
@@ -19,8 +19,8 @@
import java.io.Serializable;
import java.rmi.Remote;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface HelloHome extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/Sful.java
index d07c3ba..0a1212b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/Sful.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.perf.local2;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface Sful extends Common
{}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/SfulEJB.java
index 3fe370b..3648c86 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/SfulEJB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.perf.local2;
-import javax.ejb.*;
+import jakarta.ejb.*;
public class SfulEJB implements SessionBean
{
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/SfulHome.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/SfulHome.java
index d4b1014..81eb697 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/SfulHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/SfulHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.perf.local2;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface SfulHome extends EJBLocalHome
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/Sless.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/Sless.java
index 6189d5e..e83df18 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/Sless.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.perf.local2;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface Sless extends Common
{}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/SlessEJB.java
index 62a1a7d..92328cb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/SlessEJB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.perf.local2;
-import javax.ejb.*;
+import jakarta.ejb.*;
public class SlessEJB implements SessionBean
{
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/SlessHome.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/SlessHome.java
index 1de02c1..e781cca 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/SlessHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/SlessHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.perf.local2;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface SlessHome extends EJBLocalHome
{
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/client/Client.java
index 85a3990..f89ef88 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/client/Client.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb.perf.timer1;
import jakarta.jms.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.Resource;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/ejb/TimerSession.java b/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/ejb/TimerSession.java
index d764912..1ae84cc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/ejb/TimerSession.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/ejb/TimerSession.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.perf.timer1;
-import javax.ejb.*;
+import jakarta.ejb.*;
@Remote
public interface TimerSession {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/ejb/TimerSessionEJB.java b/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/ejb/TimerSessionEJB.java
index 6f2f4d4..b4b01d0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/ejb/TimerSessionEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/ejb/TimerSessionEJB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.perf.timer1;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.jms.*;
import jakarta.annotation.*;
import java.util.Date;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/client/Client.java
index 3d823ae..7cf5e8e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/client/Client.java
@@ -20,7 +20,7 @@
import javax.naming.*;
import jakarta.jms.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.rmi.PortableRemoteObject;
import com.sun.s1asdev.ejb.sfsb.cacheNPE.ejb.SFSBHome;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SFSB.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SFSB.java
index fa23a54..f9de77c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SFSB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.sfsb.cacheNPE.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
public interface SFSB
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SFSBEJB.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SFSBEJB.java
index adbfff6..5298e37 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SFSBEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SFSBEJB.java
@@ -16,9 +16,9 @@
package com.sun.s1asdev.ejb.sfsb.cacheNPE.ejb;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.*;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.*;
import javax.naming.Context;
import javax.naming.InitialContext;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SFSBHome.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SFSBHome.java
index 2fb8230..2a457eb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SFSBHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SFSBHome.java
@@ -17,8 +17,8 @@
package com.sun.s1asdev.ejb.sfsb.cacheNPE.ejb;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface SFSBHome
extends EJBHome
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SimpleEntityBean.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SimpleEntityBean.java
index f5489a9..b9a73d0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SimpleEntityBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SimpleEntityBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.sfsb.cacheNPE.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.rmi.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SimpleEntityHome.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SimpleEntityHome.java
index 2e48dfb..ce40249 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SimpleEntityHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SimpleEntityHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.sfsb.cacheNPE.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleEntityHome
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SimpleEntityLocal.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SimpleEntityLocal.java
index 11b9090..eb6c91a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SimpleEntityLocal.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SimpleEntityLocal.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.sfsb.cacheNPE.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleEntityLocal
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SimpleEntityLocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SimpleEntityLocalHome.java
index d3d657b..0bdbdc8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SimpleEntityLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SimpleEntityLocalHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.sfsb.cacheNPE.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleEntityLocalHome
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SimpleEntityRemote.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SimpleEntityRemote.java
index 570da27..b199220 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SimpleEntityRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SimpleEntityRemote.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.sfsb.cacheNPE.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleEntityRemote
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/client/Client.java
index 9e9950e..02d4cec 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/client/Client.java
@@ -20,7 +20,7 @@
import javax.naming.*;
import jakarta.jms.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.rmi.PortableRemoteObject;
import com.sun.s1asdev.ejb.sfsb.keepstate.ejb.SFSBHome;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSB.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSB.java
index 1a34870..5e697cd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.sfsb.keepstate.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
public interface SFSB
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBEJB.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBEJB.java
index aacbd1b..139b5bd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBEJB.java
@@ -16,9 +16,9 @@
package com.sun.s1asdev.ejb.sfsb.keepstate.ejb;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.*;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.*;
import javax.naming.Context;
import javax.naming.InitialContext;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBHome.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBHome.java
index a8b0eb3..fa34638 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBHome.java
@@ -17,8 +17,8 @@
package com.sun.s1asdev.ejb.sfsb.keepstate.ejb;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface SFSBHome
extends EJBHome
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBLocal.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBLocal.java
index 962d0f4..76ce881 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBLocal.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBLocal.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.sfsb.keepstate.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface SFSBLocal
extends EJBLocalObject
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBLocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBLocalHome.java
index 37af905..0502a12 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBLocalHome.java
@@ -16,8 +16,8 @@
package com.sun.s1asdev.ejb.sfsb.keepstate.ejb;
-import javax.ejb.EJBLocalHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
public interface SFSBLocalHome
extends EJBLocalHome
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SimpleEntityBean.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SimpleEntityBean.java
index 7845801..4e5612c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SimpleEntityBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SimpleEntityBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.sfsb.keepstate.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.rmi.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SimpleEntityHome.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SimpleEntityHome.java
index 18c6ec3..f8a8a83 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SimpleEntityHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SimpleEntityHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.sfsb.keepstate.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleEntityHome
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SimpleEntityLocal.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SimpleEntityLocal.java
index f610fc2..f6141e6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SimpleEntityLocal.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SimpleEntityLocal.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.sfsb.keepstate.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleEntityLocal
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SimpleEntityLocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SimpleEntityLocalHome.java
index 7537e27..4f3edba 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SimpleEntityLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SimpleEntityLocalHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.sfsb.keepstate.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleEntityLocalHome
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SimpleEntityRemote.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SimpleEntityRemote.java
index 6fb2c23..55e6e00 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SimpleEntityRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SimpleEntityRemote.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.sfsb.keepstate.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleEntityRemote
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/client/Client.java
index f978a62..4f182ae 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/client/Client.java
@@ -19,7 +19,7 @@
import java.util.ArrayList;
import javax.naming.*;
import jakarta.jms.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.rmi.PortableRemoteObject;
import com.sun.s1asdev.ejb.ejb30.sfsb.lifecycle.ejb.SFSBHome;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/LifecycleListener.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/LifecycleListener.java
index 5538b45..112e556 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/LifecycleListener.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/LifecycleListener.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.sfsb.lifecycle.ejb;
-import javax.ejb.PostActivate;
+import jakarta.ejb.PostActivate;
public class LifecycleListener {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSB.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSB.java
index d684faf..9a11488 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.sfsb.lifecycle.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
public interface SFSB
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSBEJB.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSBEJB.java
index adfb28a..6bbbc9a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSBEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSBEJB.java
@@ -16,9 +16,9 @@
package com.sun.s1asdev.ejb.ejb30.sfsb.lifecycle.ejb;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.*;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.*;
import javax.naming.Context;
import javax.naming.InitialContext;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSBHome.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSBHome.java
index 09f799a..68fbb1d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSBHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSBHome.java
@@ -17,8 +17,8 @@
package com.sun.s1asdev.ejb.ejb30.sfsb.lifecycle.ejb;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface SFSBHome
extends EJBHome
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSBLocal.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSBLocal.java
index a8e476e..87715be 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSBLocal.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSBLocal.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.sfsb.lifecycle.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface SFSBLocal
extends EJBLocalObject
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSBLocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSBLocalHome.java
index e4a01d9..b88dc2d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSBLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSBLocalHome.java
@@ -16,8 +16,8 @@
package com.sun.s1asdev.ejb.ejb30.sfsb.lifecycle.ejb;
-import javax.ejb.EJBLocalHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
public interface SFSBLocalHome
extends EJBLocalHome
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/client/Client.java
index fec8470..a3c0f2a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/client/Client.java
@@ -19,7 +19,7 @@
import java.util.ArrayList;
import javax.naming.*;
import jakarta.jms.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.rmi.PortableRemoteObject;
import com.sun.s1asdev.ejb.sfsb.passivateactivate.ejb.SFSBHome;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSB.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSB.java
index fdbbb87..2b4a211 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.sfsb.passivateactivate.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
public interface SFSB
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBEJB.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBEJB.java
index cb6cb8a..5a1bf55 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBEJB.java
@@ -16,9 +16,9 @@
package com.sun.s1asdev.ejb.sfsb.passivateactivate.ejb;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.*;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.*;
import javax.naming.Context;
import javax.naming.InitialContext;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBHome.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBHome.java
index 44bf2f6..4c636b3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBHome.java
@@ -17,8 +17,8 @@
package com.sun.s1asdev.ejb.sfsb.passivateactivate.ejb;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface SFSBHome
extends EJBHome
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBLocal.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBLocal.java
index 455a32b..b54aca7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBLocal.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBLocal.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.sfsb.passivateactivate.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface SFSBLocal
extends EJBLocalObject
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBLocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBLocalHome.java
index 9d51e95..c91cb9d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBLocalHome.java
@@ -16,8 +16,8 @@
package com.sun.s1asdev.ejb.sfsb.passivateactivate.ejb;
-import javax.ejb.EJBLocalHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
public interface SFSBLocalHome
extends EJBLocalHome
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SimpleEntityBean.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SimpleEntityBean.java
index bdf6ba8..c9e4eca 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SimpleEntityBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SimpleEntityBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.sfsb.passivateactivate.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.rmi.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SimpleEntityHome.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SimpleEntityHome.java
index 823ee63..3e78ef4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SimpleEntityHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SimpleEntityHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.sfsb.passivateactivate.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleEntityHome
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SimpleEntityLocal.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SimpleEntityLocal.java
index f8a0924..3c39534 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SimpleEntityLocal.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SimpleEntityLocal.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.sfsb.passivateactivate.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleEntityLocal
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SimpleEntityLocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SimpleEntityLocalHome.java
index 8c625b3..eb22d16 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SimpleEntityLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SimpleEntityLocalHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.sfsb.passivateactivate.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleEntityLocalHome
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SimpleEntityRemote.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SimpleEntityRemote.java
index bedde17..bd515ba 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SimpleEntityRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SimpleEntityRemote.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.sfsb.passivateactivate.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleEntityRemote
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/client/Client.java
index 25d2cef..6c1c63a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/client/Client.java
@@ -20,7 +20,7 @@
import javax.naming.*;
import jakarta.jms.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.rmi.PortableRemoteObject;
import com.sun.s1asdev.ejb.ejb30.sfsb.lifecycle.ejb.SFSBHome;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/LifecycleListener.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/LifecycleListener.java
index 5538b45..112e556 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/LifecycleListener.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/LifecycleListener.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.sfsb.lifecycle.ejb;
-import javax.ejb.PostActivate;
+import jakarta.ejb.PostActivate;
public class LifecycleListener {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSB.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSB.java
index d684faf..9a11488 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.sfsb.lifecycle.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
public interface SFSB
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSBEJB.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSBEJB.java
index adfb28a..6bbbc9a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSBEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSBEJB.java
@@ -16,9 +16,9 @@
package com.sun.s1asdev.ejb.ejb30.sfsb.lifecycle.ejb;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.*;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.*;
import javax.naming.Context;
import javax.naming.InitialContext;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSBHome.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSBHome.java
index 09f799a..68fbb1d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSBHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSBHome.java
@@ -17,8 +17,8 @@
package com.sun.s1asdev.ejb.ejb30.sfsb.lifecycle.ejb;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface SFSBHome
extends EJBHome
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSBLocal.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSBLocal.java
index a8e476e..87715be 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSBLocal.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSBLocal.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.sfsb.lifecycle.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface SFSBLocal
extends EJBLocalObject
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSBLocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSBLocalHome.java
index e4a01d9..b88dc2d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSBLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSBLocalHome.java
@@ -16,8 +16,8 @@
package com.sun.s1asdev.ejb.ejb30.sfsb.lifecycle.ejb;
-import javax.ejb.EJBLocalHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
public interface SFSBLocalHome
extends EJBLocalHome
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/client/Client.java
index d56fcce..d61571b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/client/Client.java
@@ -20,7 +20,7 @@
import javax.naming.*;
import jakarta.jms.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.rmi.PortableRemoteObject;
import com.sun.s1asdev.ejb.sfsb.stress.ejb.StressSFSBHome;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/client/LoadGenerator.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/client/LoadGenerator.java
index 3fcf1f7..725d2c4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/client/LoadGenerator.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/client/LoadGenerator.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.sfsb.stress.client;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.rmi.PortableRemoteObject;
import java.util.Properties;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/client/StressSFSBClient.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/client/StressSFSBClient.java
index 46bd034..c635849 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/client/StressSFSBClient.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/client/StressSFSBClient.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.sfsb.stress.client;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.rmi.PortableRemoteObject;
import java.util.Properties;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/ejb/StressSFSB.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/ejb/StressSFSB.java
index 4a19a4c..fa62bbf 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/ejb/StressSFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/ejb/StressSFSB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.sfsb.stress.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
public interface StressSFSB
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/ejb/StressSFSBBean.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/ejb/StressSFSBBean.java
index 4cf8e1e..1b75a9c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/ejb/StressSFSBBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/ejb/StressSFSBBean.java
@@ -16,9 +16,9 @@
package com.sun.s1asdev.ejb.sfsb.stress.ejb;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.*;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.*;
import javax.naming.Context;
import javax.naming.InitialContext;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/ejb/StressSFSBHome.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/ejb/StressSFSBHome.java
index d918896..758c2aa 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/ejb/StressSFSBHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/ejb/StressSFSBHome.java
@@ -17,8 +17,8 @@
package com.sun.s1asdev.ejb.sfsb.stress.ejb;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface StressSFSBHome
extends EJBHome
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/client/Client.java
index d0827f1..2ce8a0b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/client/Client.java
@@ -20,7 +20,7 @@
import javax.naming.*;
import jakarta.jms.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.rmi.PortableRemoteObject;
import com.sun.s1asdev.ejb.stress.passivateactivate.ejb.SFSBHome;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/ejb/SFSB.java b/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/ejb/SFSB.java
index 7357f83..35fbf08 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/ejb/SFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/ejb/SFSB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.stress.passivateactivate.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
public interface SFSB
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/ejb/SFSBEJB.java b/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/ejb/SFSBEJB.java
index ed954f8..8b2ec1d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/ejb/SFSBEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/ejb/SFSBEJB.java
@@ -16,8 +16,8 @@
package com.sun.s1asdev.ejb.stress.passivateactivate.ejb;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/ejb/SFSBHome.java b/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/ejb/SFSBHome.java
index b6a3512..7ebf5c3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/ejb/SFSBHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/ejb/SFSBHome.java
@@ -17,8 +17,8 @@
package com.sun.s1asdev.ejb.stress.passivateactivate.ejb;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface SFSBHome
extends EJBHome
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/client/Client.java
index 5211d07..af3c018 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/client/Client.java
@@ -20,7 +20,7 @@
import javax.naming.*;
import jakarta.jms.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.rmi.PortableRemoteObject;
import com.sun.s1asdev.ejb.stress.sfsbcache.ejb.SFSBHome;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/ejb/SFSB.java b/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/ejb/SFSB.java
index 8407548..0ba4040 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/ejb/SFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/ejb/SFSB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.stress.sfsbcache.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
public interface SFSB
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/ejb/SFSBEJB.java b/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/ejb/SFSBEJB.java
index 6cd5536..f0f1e14 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/ejb/SFSBEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/ejb/SFSBEJB.java
@@ -16,8 +16,8 @@
package com.sun.s1asdev.ejb.stress.sfsbcache.ejb;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/ejb/SFSBHome.java b/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/ejb/SFSBHome.java
index f788ba7..6ba094a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/ejb/SFSBHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/ejb/SFSBHome.java
@@ -17,8 +17,8 @@
package com.sun.s1asdev.ejb.stress.sfsbcache.ejb;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface SFSBHome
extends EJBHome
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/appclient/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/appclient/client/Client.java
index 1cc6600..0eebc28 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/appclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/appclient/client/Client.java
@@ -18,7 +18,7 @@
import java.io.*;
import java.util.*;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
import javax.naming.*;
import javax.rmi.PortableRemoteObject;
import org.omg.CORBA.ORB;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/appclient/client/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/appclient/client/Hello.java
index 554f8a6..d23f12a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/appclient/client/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/appclient/client/Hello.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.stubs.ejbapp;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.Remote;
import java.rmi.RemoteException;
import java.io.Serializable;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/appclient/client/HelloHome.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/appclient/client/HelloHome.java
index 147fd94..759f1e0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/appclient/client/HelloHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/appclient/client/HelloHome.java
@@ -19,8 +19,8 @@
import java.io.Serializable;
import java.rmi.Remote;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface HelloHome extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/client/Client.java
index fcf7863..a9e97c4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/client/Client.java
@@ -19,7 +19,7 @@
import java.net.*;
import java.io.*;
import java.util.*;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
import javax.naming.*;
import javax.rmi.PortableRemoteObject;
import org.omg.CORBA.ORB;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/DummyMEJBBean.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/DummyMEJBBean.java
index 2666eac..7d38921 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/DummyMEJBBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/DummyMEJBBean.java
@@ -18,9 +18,9 @@
import java.io.Serializable;
import java.rmi.RemoteException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
import java.util.*;
//import javax.management.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/Foo.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/Foo.java
index 768ec84..2c5a7b8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/Foo.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/Foo.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.stubs.ejbapp;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.Remote;
import java.rmi.RemoteException;
import java.io.Serializable;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/FooBean.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/FooBean.java
index 73d43b1..1581ec6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/FooBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/FooBean.java
@@ -19,9 +19,9 @@
import java.util.Enumeration;
import java.io.Serializable;
import java.rmi.RemoteException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
import javax.naming.*;
import javax.rmi.PortableRemoteObject;
import com.sun.s1asdev.ejb.stubs.ejbapp.HelloHome;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/FooHome.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/FooHome.java
index cbbd6ee..395311c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/FooHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/FooHome.java
@@ -19,8 +19,8 @@
import java.io.Serializable;
import java.rmi.Remote;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface FooHome extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/Hello.java
index 554f8a6..d23f12a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/Hello.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.stubs.ejbapp;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.Remote;
import java.rmi.RemoteException;
import java.io.Serializable;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/HelloBean.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/HelloBean.java
index 3285300..38f037d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/HelloBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/HelloBean.java
@@ -19,9 +19,9 @@
import java.util.Enumeration;
import java.io.Serializable;
import java.rmi.RemoteException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
public class HelloBean implements SessionBean {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/HelloHome.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/HelloHome.java
index 147fd94..759f1e0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/HelloHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/HelloHome.java
@@ -19,8 +19,8 @@
import java.io.Serializable;
import java.rmi.Remote;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface HelloHome extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/servlet/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/servlet/Hello.java
index 554f8a6..d23f12a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/servlet/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/servlet/Hello.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.stubs.ejbapp;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.Remote;
import java.rmi.RemoteException;
import java.io.Serializable;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/servlet/HelloHome.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/servlet/HelloHome.java
index 147fd94..759f1e0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/servlet/HelloHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/servlet/HelloHome.java
@@ -19,8 +19,8 @@
import java.io.Serializable;
import java.rmi.Remote;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface HelloHome extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/client/Client.java
index 757fb97..722a053 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/client/Client.java
@@ -18,7 +18,7 @@
import java.io.*;
import java.util.*;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
import javax.naming.*;
import javax.rmi.PortableRemoteObject;
import org.omg.CORBA.ORB;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/ejb/Foo.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/ejb/Foo.java
index e37ba90..09995fc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/ejb/Foo.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/ejb/Foo.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.stubs.ejbclient;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.Remote;
import java.rmi.RemoteException;
import java.io.Serializable;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/ejb/FooBean.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/ejb/FooBean.java
index a644ee7..c627064 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/ejb/FooBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/ejb/FooBean.java
@@ -19,9 +19,9 @@
import java.util.Enumeration;
import java.io.Serializable;
import java.rmi.RemoteException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
import javax.naming.*;
import javax.rmi.PortableRemoteObject;
import com.sun.s1asdev.ejb.stubs.ejbapp.HelloHome;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/ejb/FooHome.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/ejb/FooHome.java
index 588ed0a..fadac0b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/ejb/FooHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/ejb/FooHome.java
@@ -19,8 +19,8 @@
import java.io.Serializable;
import java.rmi.Remote;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface FooHome extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/ejb/Hello.java
index 554f8a6..d23f12a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/ejb/Hello.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.stubs.ejbapp;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.Remote;
import java.rmi.RemoteException;
import java.io.Serializable;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/ejb/HelloHome.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/ejb/HelloHome.java
index 147fd94..759f1e0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/ejb/HelloHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/ejb/HelloHome.java
@@ -19,8 +19,8 @@
import java.io.Serializable;
import java.rmi.Remote;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface HelloHome extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/client/Client.java
index 809797c..b6fd438 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/client/Client.java
@@ -18,7 +18,7 @@
import java.io.*;
import java.util.*;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
import javax.naming.*;
import javax.rmi.PortableRemoteObject;
import org.omg.CORBA.ORB;
@@ -95,7 +95,7 @@
try {
h.throwAppException1();
throw new Exception("didn't get exception for testException2");
- } catch(javax.ejb.FinderException e) {
+ } catch(jakarta.ejb.FinderException e) {
System.out.println("Successfully caught exception " +
e.getClass() + " " + e.getMessage());
}
@@ -103,7 +103,7 @@
try {
h.throwAppException2();
throw new Exception("didn't get exception for testException3");
- } catch(javax.ejb.FinderException e) {
+ } catch(jakarta.ejb.FinderException e) {
System.out.println("Successfully caught exception " +
e.getClass() + " " + e.getMessage());
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/Bmp.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/Bmp.java
index e2fdefa..b8a35a2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/Bmp.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/Bmp.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.stubs.proxy;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface Bmp extends Common
{}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/BmpEJB.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/BmpEJB.java
index a765426..ed480b5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/BmpEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/BmpEJB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.stubs.proxy;
-import javax.ejb.*;
+import jakarta.ejb.*;
public class BmpEJB implements EntityBean
{
@@ -75,12 +75,12 @@
// throws some checked exception which is a subclass of the declared
// checked exception
- public void testException3() throws javax.ejb.FinderException {
+ public void testException3() throws jakarta.ejb.FinderException {
throw new ObjectNotFoundException("testException3");
}
// throws some checked exception
- public void testException4() throws javax.ejb.FinderException {
+ public void testException4() throws jakarta.ejb.FinderException {
throw new FinderException("testException4");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/BmpHome.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/BmpHome.java
index b67345e..3e4cb7d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/BmpHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/BmpHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.stubs.proxy;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface BmpHome extends EJBLocalHome
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/BmpRemote.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/BmpRemote.java
index b745cac..87c90cc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/BmpRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/BmpRemote.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.stubs.proxy;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
public interface BmpRemote extends CommonRemote
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/BmpRemoteHome.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/BmpRemoteHome.java
index e53db9d..c3f29fc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/BmpRemoteHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/BmpRemoteHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.stubs.proxy;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
public interface BmpRemoteHome extends EJBHome
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/Common.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/Common.java
index d71d828..0346192 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/Common.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/Common.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.stubs.proxy;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface Common extends EJBLocalObject
{
@@ -42,5 +42,5 @@
void testException2();
// throws some checked exception
- void testException3() throws javax.ejb.FinderException;
+ void testException3() throws jakarta.ejb.FinderException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/CommonRemote.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/CommonRemote.java
index c6dfb34..c9d7597 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/CommonRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/CommonRemote.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.stubs.proxy;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
public interface CommonRemote extends EJBObject
@@ -43,9 +43,9 @@
void testException2() throws RemoteException;
// throws some checked exception
- void testException3() throws javax.ejb.FinderException, RemoteException;
+ void testException3() throws jakarta.ejb.FinderException, RemoteException;
- void testException4() throws javax.ejb.FinderException, RemoteException;
+ void testException4() throws jakarta.ejb.FinderException, RemoteException;
void testPassByRef1(int a) throws RemoteException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/Hello.java
index 7ef7f42..8182c2c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/Hello.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.stubs.proxy;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
public interface Hello extends EJBObject
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/HelloEJB.java
index db9a2d6..6a8627e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/HelloEJB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.stubs.proxy;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import java.util.*;
import javax.rmi.PortableRemoteObject;
@@ -114,7 +114,7 @@
slessHome.remove(sless);
throw new EJBException("expecting remove exception when " +
"removing sless bean through EJBLocalHome");
- } catch(javax.ejb.RemoveException e) {
+ } catch(jakarta.ejb.RemoveException e) {
System.out.println("Successfully caught RemoveException for " +
"sless local home");
// success
@@ -124,7 +124,7 @@
sfulHome.remove(sful);
throw new EJBException("expecting remove exception when " +
"removing sful bean through EJBLocalHome");
- } catch(javax.ejb.RemoveException e) {
+ } catch(jakarta.ejb.RemoveException e) {
System.out.println("Successfully caught RemoveException for " +
"sful local home");
// success
@@ -152,7 +152,7 @@
slessRemoteHome.remove(slessRemote);
throw new EJBException("expecting remove exception when " +
"removing sless bean through EJBHome");
- } catch(javax.ejb.RemoveException e) {
+ } catch(jakarta.ejb.RemoveException e) {
System.out.println("Successfully caught RemoveException for " +
"sless home");
// success
@@ -162,7 +162,7 @@
sfulRemoteHome.remove(sfulRemote);
throw new EJBException("expecting remove exception when " +
"removing sful bean through EJBHome");
- } catch(javax.ejb.RemoveException e) {
+ } catch(jakarta.ejb.RemoveException e) {
System.out.println("Successfully caught RemoveException for " +
"sful home");
// success
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/HelloHome.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/HelloHome.java
index 6a71212..cac08db 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/HelloHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/HelloHome.java
@@ -19,8 +19,8 @@
import java.io.Serializable;
import java.rmi.Remote;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface HelloHome extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/Sful.java
index 1ea7c3a..828ce1f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/Sful.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.stubs.proxy;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface Sful extends Common
{}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SfulEJB.java
index a68deb0..e416915 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SfulEJB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.stubs.proxy;
-import javax.ejb.*;
+import jakarta.ejb.*;
public class SfulEJB implements SessionBean
{
@@ -63,12 +63,12 @@
// throws some checked exception which is a subclass of the declared
// checked exception
- public void testException3() throws javax.ejb.FinderException {
+ public void testException3() throws jakarta.ejb.FinderException {
throw new ObjectNotFoundException("testException3");
}
// throws some checked exception
- public void testException4() throws javax.ejb.FinderException {
+ public void testException4() throws jakarta.ejb.FinderException {
throw new FinderException("testException4");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SfulHome.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SfulHome.java
index f9a9803..b5e233e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SfulHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SfulHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.stubs.proxy;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface SfulHome extends EJBLocalHome
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SfulRemote.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SfulRemote.java
index 2536828..3278365 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SfulRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SfulRemote.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.stubs.proxy;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface SfulRemote extends CommonRemote
{}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SfulRemoteHome.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SfulRemoteHome.java
index b04ebde..357718f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SfulRemoteHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SfulRemoteHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.stubs.proxy;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
public interface SfulRemoteHome extends EJBHome
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/Sless.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/Sless.java
index e058296..d8c9e86 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/Sless.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.stubs.proxy;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface Sless extends Common
{}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SlessEJB.java
index 929bc23..9be053e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SlessEJB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.stubs.proxy;
-import javax.ejb.*;
+import jakarta.ejb.*;
public class SlessEJB implements SessionBean
{
@@ -60,13 +60,13 @@
// throws some checked exception which is a subclass of the declared
// checked exception
- public void testException3() throws javax.ejb.FinderException {
+ public void testException3() throws jakarta.ejb.FinderException {
throw new ObjectNotFoundException("testException3");
}
// throws some checked exception
- public void testException4() throws javax.ejb.FinderException {
- throw new javax.ejb.FinderException("testException4");
+ public void testException4() throws jakarta.ejb.FinderException {
+ throw new jakarta.ejb.FinderException("testException4");
}
public void testPassByRef1(int a) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SlessHome.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SlessHome.java
index a10bd42..1966150 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SlessHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SlessHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.stubs.proxy;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface SlessHome extends EJBLocalHome
{
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SlessRemote.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SlessRemote.java
index d9c1065..8beeba1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SlessRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SlessRemote.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.stubs.proxy;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface SlessRemote extends CommonRemote
{}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SlessRemoteHome.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SlessRemoteHome.java
index c2ca11d..ab6b314 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SlessRemoteHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SlessRemoteHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.stubs.proxy;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
public interface SlessRemoteHome extends EJBHome
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/client/Btest.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/client/Btest.java
index a07eaa3..421184b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/client/Btest.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/client/Btest.java
@@ -24,8 +24,8 @@
import javax.rmi.PortableRemoteObject;
-import javax.ejb.EJBHome;
-import javax.ejb.EJBMetaData;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.EJBMetaData;
public class Btest{
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/client/Client.java
index 90593b8..93dd624 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/client/Client.java
@@ -19,9 +19,9 @@
import java.io.*;
import java.util.*;
-import javax.ejb.EJBHome;
-import javax.ejb.Handle;
-import javax.ejb.EJBMetaData;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.Handle;
+import jakarta.ejb.EJBMetaData;
import javax.naming.*;
import javax.rmi.PortableRemoteObject;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/client/SimpleClient.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/client/SimpleClient.java
index ab9054f..2b3a40c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/client/SimpleClient.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/client/SimpleClient.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.stubs.standaloneclient;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.rmi.PortableRemoteObject;
import java.util.Properties;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo1.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo1.java
index a8bce5c..ef15532 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo1.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo1.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.stubs.stubcount;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.Remote;
import java.rmi.RemoteException;
import java.io.Serializable;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo10.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo10.java
index 8b242b7..fdb688a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo10.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo10.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.stubs.stubcount;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.Remote;
import java.rmi.RemoteException;
import java.io.Serializable;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo2.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo2.java
index c4a293e..3ac5b4f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo2.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.stubs.stubcount;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.Remote;
import java.rmi.RemoteException;
import java.io.Serializable;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo3.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo3.java
index 877e91d..5297b62 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo3.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.stubs.stubcount;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.Remote;
import java.rmi.RemoteException;
import java.io.Serializable;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo4.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo4.java
index 9bebf60..47fc833 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo4.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo4.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.stubs.stubcount;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.Remote;
import java.rmi.RemoteException;
import java.io.Serializable;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo5.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo5.java
index 3d4a33c..3b94f7b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo5.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo5.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.stubs.stubcount;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.Remote;
import java.rmi.RemoteException;
import java.io.Serializable;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo6.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo6.java
index 2d553db..f15bf44 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo6.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo6.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.stubs.stubcount;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.Remote;
import java.rmi.RemoteException;
import java.io.Serializable;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo7.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo7.java
index ecb2b8c..856c4a0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo7.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo7.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.stubs.stubcount;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.Remote;
import java.rmi.RemoteException;
import java.io.Serializable;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo8.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo8.java
index cb22d6e..41e2193 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo8.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo8.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.stubs.stubcount;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.Remote;
import java.rmi.RemoteException;
import java.io.Serializable;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo9.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo9.java
index 0af6f00..0cfc171 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo9.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo9.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.stubs.stubcount;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.Remote;
import java.rmi.RemoteException;
import java.io.Serializable;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooBean.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooBean.java
index e9e703e..144d448 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooBean.java
@@ -19,9 +19,9 @@
import java.util.Enumeration;
import java.io.Serializable;
import java.rmi.RemoteException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
import javax.naming.*;
import javax.rmi.PortableRemoteObject;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome1.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome1.java
index 6ddf980..3990f1a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome1.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome1.java
@@ -19,8 +19,8 @@
import java.io.Serializable;
import java.rmi.Remote;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface FooHome1 extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome10.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome10.java
index 9c4e528..f3e2295 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome10.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome10.java
@@ -19,8 +19,8 @@
import java.io.Serializable;
import java.rmi.Remote;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface FooHome10 extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome2.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome2.java
index a2b2823..a6c6c46 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome2.java
@@ -19,8 +19,8 @@
import java.io.Serializable;
import java.rmi.Remote;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface FooHome2 extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome3.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome3.java
index 913dc17..fe1896a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome3.java
@@ -19,8 +19,8 @@
import java.io.Serializable;
import java.rmi.Remote;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface FooHome3 extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome4.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome4.java
index 5479433..05b4489 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome4.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome4.java
@@ -19,8 +19,8 @@
import java.io.Serializable;
import java.rmi.Remote;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface FooHome4 extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome5.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome5.java
index 1663f65..74e30ea 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome5.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome5.java
@@ -19,8 +19,8 @@
import java.io.Serializable;
import java.rmi.Remote;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface FooHome5 extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome6.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome6.java
index c073eea..d540393 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome6.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome6.java
@@ -19,8 +19,8 @@
import java.io.Serializable;
import java.rmi.Remote;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface FooHome6 extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome7.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome7.java
index d01a3f9..fbfece0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome7.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome7.java
@@ -19,8 +19,8 @@
import java.io.Serializable;
import java.rmi.Remote;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface FooHome7 extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome8.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome8.java
index 0fdf3bf..ffe7328 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome8.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome8.java
@@ -19,8 +19,8 @@
import java.io.Serializable;
import java.rmi.Remote;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface FooHome8 extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome9.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome9.java
index 800a9cd..83eafcb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome9.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome9.java
@@ -19,8 +19,8 @@
import java.io.Serializable;
import java.rmi.Remote;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface FooHome9 extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/client/Client.java
index bdadd51..157bb8d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/client/Client.java
@@ -18,7 +18,7 @@
import java.io.*;
import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.rmi.PortableRemoteObject;
import org.omg.CORBA.ORB;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/Foo.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/Foo.java
index fbce365..3a3c662 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/Foo.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/Foo.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.stubs.stubser;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.Remote;
import java.rmi.RemoteException;
import java.io.Serializable;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/FooBean.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/FooBean.java
index bf2a039..22143f9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/FooBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/FooBean.java
@@ -20,10 +20,10 @@
import java.util.Collection;
import java.io.Serializable;
import java.rmi.RemoteException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
-import javax.ejb.TimerService;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.TimerService;
import javax.naming.*;
import javax.rmi.PortableRemoteObject;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/FooHome.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/FooHome.java
index ae3a353..1bcdbce 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/FooHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/FooHome.java
@@ -19,8 +19,8 @@
import java.io.Serializable;
import java.rmi.Remote;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface FooHome extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/Hello.java
index e42675c..c6a64a0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/Hello.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.stubs.stubser;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.Remote;
import java.rmi.RemoteException;
import java.io.Serializable;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/HelloBean.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/HelloBean.java
index 2294904..8713eba 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/HelloBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/HelloBean.java
@@ -19,9 +19,9 @@
import java.util.Enumeration;
import java.io.Serializable;
import java.rmi.RemoteException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
public class HelloBean implements SessionBean {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/HelloHome.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/HelloHome.java
index ed7c59a..b5de23c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/HelloHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/HelloHome.java
@@ -19,8 +19,8 @@
import java.io.Serializable;
import java.rmi.Remote;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface HelloHome extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/servlet/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/servlet/Hello.java
index 554f8a6..d23f12a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/servlet/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/servlet/Hello.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.stubs.ejbapp;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.Remote;
import java.rmi.RemoteException;
import java.io.Serializable;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/servlet/HelloHome.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/servlet/HelloHome.java
index 147fd94..759f1e0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/servlet/HelloHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/servlet/HelloHome.java
@@ -19,8 +19,8 @@
import java.io.Serializable;
import java.rmi.Remote;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface HelloHome extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/descriptor/ejb-jar.xml
index bfe50b5..2e12c42 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/descriptor/ejb-jar.xml
@@ -61,7 +61,7 @@
<ejb-name>MDB1</ejb-name>
<method-name>ejbTimeout</method-name>
<method-params>
- <method-param>javax.ejb.Timer</method-param>
+ <method-param>jakarta.ejb.Timer</method-param>
</method-params>
</method>
<trans-attribute>RequiresNew</trans-attribute>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/ejb/MessageBean.java b/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/ejb/MessageBean.java
index 40bdf3c..ba895ed 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/ejb/MessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/ejb/MessageBean.java
@@ -18,7 +18,7 @@
import java.rmi.RemoteException;
import jakarta.jms.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import java.util.Date;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/restore/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/timer/restore/client/Client.java
index a2eda9f..fe5c5c0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/restore/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/restore/client/Client.java
@@ -18,7 +18,7 @@
import javax.naming.*;
import jakarta.jms.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.rmi.PortableRemoteObject;
import java.util.HashSet;
import java.util.Set;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/restore/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/timer/restore/descriptor/ejb-jar.xml
index 0d22a74..9c8459e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/restore/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/restore/descriptor/ejb-jar.xml
@@ -56,7 +56,7 @@
<ejb-name>TimerSessionEJB</ejb-name>
<method-name>ejbTimeout</method-name>
<method-params>
- <method-param>javax.ejb.Timer</method-param>
+ <method-param>jakarta.ejb.Timer</method-param>
</method-params>
</method>
<trans-attribute>RequiresNew</trans-attribute>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/restore/ejb/TimerSession.java b/appserver/tests/appserv-tests/devtests/ejb/timer/restore/ejb/TimerSession.java
index ae79127..b67ce95 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/restore/ejb/TimerSession.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/restore/ejb/TimerSession.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.timer.restore;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
public interface TimerSession extends EJBObject {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/restore/ejb/TimerSessionEJB.java b/appserver/tests/appserv-tests/devtests/ejb/timer/restore/ejb/TimerSessionEJB.java
index 032a037..9d4b1c7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/restore/ejb/TimerSessionEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/restore/ejb/TimerSessionEJB.java
@@ -18,13 +18,13 @@
import java.util.Iterator;
import java.util.Date;
-import javax.ejb.TimedObject;
-import javax.ejb.Timer;
-import javax.ejb.TimerHandle;
-import javax.ejb.TimerService;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.TimedObject;
+import jakarta.ejb.Timer;
+import jakarta.ejb.TimerHandle;
+import jakarta.ejb.TimerService;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
import jakarta.jms.Session;
import java.rmi.RemoteException;
import jakarta.jms.QueueConnectionFactory;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/restore/ejb/TimerSessionHome.java b/appserver/tests/appserv-tests/devtests/ejb/timer/restore/ejb/TimerSessionHome.java
index e75b3ce..1c04f5d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/restore/ejb/TimerSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/restore/ejb/TimerSessionHome.java
@@ -17,8 +17,8 @@
package com.sun.s1asdev.ejb.timer.restore;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface TimerSessionHome extends EJBHome {
TimerSession create() throws CreateException, RemoteException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/client/Client.java
index 342546a..7f525df 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/client/Client.java
@@ -21,7 +21,7 @@
import java.util.concurrent.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import com.sun.s1asdev.ejb.timer.sessiontimer.TimerSession;
import com.sun.s1asdev.ejb.timer.sessiontimer.TimerSessionHome;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/descriptor/ejb-jar.xml
index ac49c92..0a40707 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/descriptor/ejb-jar.xml
@@ -45,7 +45,7 @@
<ejb-name>TimerSessionEJB</ejb-name>
<method-name>ejbTimeout</method-name>
<method-params>
- <method-param>javax.ejb.Timer</method-param>
+ <method-param>jakarta.ejb.Timer</method-param>
</method-params>
</method>
<trans-attribute>RequiresNew</trans-attribute>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSession.java b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSession.java
index c03a280..0ea8635 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSession.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSession.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.timer.sessiontimer;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
public interface TimerSession extends EJBObject {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSessionEJB.java b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSessionEJB.java
index a520ce1..3262ecb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSessionEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSessionEJB.java
@@ -16,13 +16,13 @@
package com.sun.s1asdev.ejb.timer.sessiontimer;
-import javax.ejb.TimedObject;
-import javax.ejb.Timer;
-import javax.ejb.TimerHandle;
-import javax.ejb.TimerService;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBContext;
+import jakarta.ejb.TimedObject;
+import jakarta.ejb.Timer;
+import jakarta.ejb.TimerHandle;
+import jakarta.ejb.TimerService;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBContext;
import java.rmi.RemoteException;
import javax.naming.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSessionHome.java b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSessionHome.java
index d49657e..14113b3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSessionHome.java
@@ -17,8 +17,8 @@
package com.sun.s1asdev.ejb.timer.sessiontimer;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface TimerSessionHome extends EJBHome {
TimerSession create() throws CreateException, RemoteException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSingleton.java b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSingleton.java
index 8412534..b2e5d16 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSingleton.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSingleton.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.timer.sessiontimer;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.util.concurrent.*;
@Singleton
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSingletonRemote.java b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSingletonRemote.java
index 868beda..4594dda 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSingletonRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSingletonRemote.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.timer.sessiontimer;
-import javax.ejb.*;
+import jakarta.ejb.*;
@Remote
public interface TimerSingletonRemote {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/client/Client.java
index 4ccdd00..9edcdf0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/client/Client.java
@@ -18,7 +18,7 @@
import javax.naming.*;
import jakarta.jms.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.rmi.PortableRemoteObject;
import com.sun.s1asdev.ejb.timer.sessiontimersecurity.TimerSession;
import com.sun.s1asdev.ejb.timer.sessiontimersecurity.TimerSessionHome;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/descriptor/ejb-jar.xml
index c50a697..790cc38 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/descriptor/ejb-jar.xml
@@ -57,7 +57,7 @@
<ejb-name>TimerSessionEJB</ejb-name>
<method-name>ejbTimeout</method-name>
<method-params>
- <method-param>javax.ejb.Timer</method-param>
+ <method-param>jakarta.ejb.Timer</method-param>
</method-params>
</method>
</method-permission>
@@ -73,7 +73,7 @@
<ejb-name>TimerSessionEJB</ejb-name>
<method-name>ejbTimeout</method-name>
<method-params>
- <method-param>javax.ejb.Timer</method-param>
+ <method-param>jakarta.ejb.Timer</method-param>
</method-params>
</method>
<trans-attribute>RequiresNew</trans-attribute>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/ejb/TimerSession.java b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/ejb/TimerSession.java
index 7675011..acfc21a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/ejb/TimerSession.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/ejb/TimerSession.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.timer.sessiontimersecurity;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
public interface TimerSession extends EJBObject {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/ejb/TimerSessionEJB.java b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/ejb/TimerSessionEJB.java
index 5339924..e205ecc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/ejb/TimerSessionEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/ejb/TimerSessionEJB.java
@@ -16,12 +16,12 @@
package com.sun.s1asdev.ejb.timer.sessiontimersecurity;
-import javax.ejb.TimedObject;
-import javax.ejb.Timer;
-import javax.ejb.TimerHandle;
-import javax.ejb.TimerService;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
+import jakarta.ejb.TimedObject;
+import jakarta.ejb.Timer;
+import jakarta.ejb.TimerHandle;
+import jakarta.ejb.TimerService;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
import jakarta.jms.Session;
import java.rmi.RemoteException;
import jakarta.jms.QueueConnectionFactory;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/ejb/TimerSessionHome.java b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/ejb/TimerSessionHome.java
index 9e95f74..c5ddff3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/ejb/TimerSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/ejb/TimerSessionHome.java
@@ -17,8 +17,8 @@
package com.sun.s1asdev.ejb.timer.sessiontimersecurity;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface TimerSessionHome extends EJBHome {
TimerSession create() throws CreateException, RemoteException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/client/Client.java
index 8dcda82..e0c183d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/client/Client.java
@@ -20,7 +20,7 @@
import javax.naming.*;
import jakarta.jms.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.rmi.PortableRemoteObject;
import com.sun.s1asdev.ejb.timer.timerserialization.ejb.TimerSFSBHome;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/descriptor/ejb-jar.xml
index 5ae3000..38cec84 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/descriptor/ejb-jar.xml
@@ -72,7 +72,7 @@
<ejb-name>TimerSLSBEJB</ejb-name>
<method-name>ejbTimeout</method-name>
<method-params>
- <method-param>javax.ejb.Timer</method-param>
+ <method-param>jakarta.ejb.Timer</method-param>
</method-params>
</method>
<trans-attribute>RequiresNew</trans-attribute>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSFSB.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSFSB.java
index a69e5d9..a6f5a5b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSFSB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.timer.timerserialization.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
public interface TimerSFSB
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSFSBEJB.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSFSBEJB.java
index 7767b75..4a1ad6b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSFSBEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSFSBEJB.java
@@ -16,13 +16,13 @@
package com.sun.s1asdev.ejb.timer.timerserialization.ejb;
-import javax.ejb.TimedObject;
-import javax.ejb.NoSuchObjectLocalException;
-import javax.ejb.Timer;
-import javax.ejb.TimerHandle;
-import javax.ejb.TimerService;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
+import jakarta.ejb.TimedObject;
+import jakarta.ejb.NoSuchObjectLocalException;
+import jakarta.ejb.Timer;
+import jakarta.ejb.TimerHandle;
+import jakarta.ejb.TimerService;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSFSBHome.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSFSBHome.java
index 8ae7d7f..9c6f951 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSFSBHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSFSBHome.java
@@ -17,8 +17,8 @@
package com.sun.s1asdev.ejb.timer.timerserialization.ejb;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface TimerSFSBHome
extends EJBHome
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSLSB.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSLSB.java
index 17fa5f7..4016262 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSLSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSLSB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.timer.timerserialization.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface TimerSLSB
extends EJBLocalObject
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSLSBEJB.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSLSBEJB.java
index 6c8247d..de0c8c5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSLSBEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSLSBEJB.java
@@ -16,12 +16,12 @@
package com.sun.s1asdev.ejb.timer.timerserialization.ejb;
-import javax.ejb.TimedObject;
-import javax.ejb.Timer;
-import javax.ejb.TimerHandle;
-import javax.ejb.TimerService;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
+import jakarta.ejb.TimedObject;
+import jakarta.ejb.Timer;
+import jakarta.ejb.TimerHandle;
+import jakarta.ejb.TimerService;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
public class TimerSLSBEJB
implements TimedObject, SessionBean
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSLSBHome.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSLSBHome.java
index c3a14e3..c65e500 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSLSBHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSLSBHome.java
@@ -16,8 +16,8 @@
package com.sun.s1asdev.ejb.timer.timerserialization.ejb;
-import javax.ejb.EJBLocalHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
public interface TimerSLSBHome
extends EJBLocalHome
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/client/Client.java
index 15d259e..3157547 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/client/Client.java
@@ -19,7 +19,7 @@
import java.io.Serializable;
import java.util.Date;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.rmi.PortableRemoteObject;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/descriptor/ejb-jar.xml
index 6c4ed22..6f00dd0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/descriptor/ejb-jar.xml
@@ -299,7 +299,7 @@
<ejb-name>msgbean_CMT</ejb-name>
<method-name>ejbTimeout</method-name>
<method-params>
- <method-param>javax.ejb.Timer</method-param>
+ <method-param>jakarta.ejb.Timer</method-param>
</method-params>
</method>
<trans-attribute>RequiresNew</trans-attribute>
@@ -317,7 +317,7 @@
<ejb-name>FooEJB_CMT</ejb-name>
<method-name>ejbTimeout</method-name>
<method-params>
- <method-param>javax.ejb.Timer</method-param>
+ <method-param>jakarta.ejb.Timer</method-param>
</method-params>
</method>
<trans-attribute>RequiresNew</trans-attribute>
@@ -361,7 +361,7 @@
<ejb-name>BarEJB_CMT</ejb-name>
<method-name>ejbTimeout</method-name>
<method-params>
- <method-param>javax.ejb.Timer</method-param>
+ <method-param>jakarta.ejb.Timer</method-param>
</method-params>
</method>
<trans-attribute>RequiresNew</trans-attribute>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/Bar.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/Bar.java
index 91d71a9..897bb0a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/Bar.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/Bar.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb.timer.timertests;
import java.rmi.RemoteException;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface Bar extends EJBObject, TimerStuff {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/BarEJB.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/BarEJB.java
index f1cc66e..48c3cf6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/BarEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/BarEJB.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb.timer.timertests;
import java.rmi.RemoteException;
-import javax.ejb.*;
+import jakarta.ejb.*;
public abstract class BarEJB
extends TimerStuffImpl
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/BarHome.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/BarHome.java
index a756af2..aeee37f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/BarHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/BarHome.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb.timer.timertests;
import java.rmi.RemoteException;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface BarHome extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/BarPrimaryKey.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/BarPrimaryKey.java
index db04a12..328c637 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/BarPrimaryKey.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/BarPrimaryKey.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb.timer.timertests;
import java.io.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
public class BarPrimaryKey implements Serializable
{
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/Foo.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/Foo.java
index e8e6058..cd8d8c0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/Foo.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/Foo.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.timer.timertests;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface Foo extends EJBObject, TimerStuff {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/FooEJB.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/FooEJB.java
index d8d9ad6..7d0b388 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/FooEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/FooEJB.java
@@ -17,9 +17,9 @@
package com.sun.s1asdev.ejb.timer.timertests;
import java.rmi.RemoteException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.*;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.*;
public class FooEJB extends TimerStuffImpl implements SessionBean, TimedObject {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/FooHome.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/FooHome.java
index 3ebe3e2..8fd6608 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/FooHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/FooHome.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb.timer.timertests;
import java.rmi.RemoteException;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface FooHome extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/MessageDrivenEJB.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/MessageDrivenEJB.java
index 28cad04..0cc8fcd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/MessageDrivenEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/MessageDrivenEJB.java
@@ -18,7 +18,7 @@
import java.rmi.RemoteException;
import jakarta.jms.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
public class MessageDrivenEJB extends TimerStuffImpl
implements MessageDrivenBean, TimedObject, MessageListener {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/Stateful.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/Stateful.java
index a4c060e..e2373e4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/Stateful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/Stateful.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.timer.timertests;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface Stateful extends EJBObject, TimerStuff {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/StatefulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/StatefulEJB.java
index 3e03458..efc9927 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/StatefulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/StatefulEJB.java
@@ -17,9 +17,9 @@
package com.sun.s1asdev.ejb.timer.timertests;
import java.rmi.RemoteException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.*;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.*;
public class StatefulEJB extends TimerStuffImpl implements SessionBean, SessionSynchronization {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/StatefulHome.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/StatefulHome.java
index f23a910..af04f7b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/StatefulHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/StatefulHome.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb.timer.timertests;
import java.rmi.RemoteException;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface StatefulHome extends EJBHome {
Stateful create(TimerHandle th) throws CreateException, RemoteException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/TimerStuff.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/TimerStuff.java
index a21a641..3df0cba 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/TimerStuff.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/TimerStuff.java
@@ -19,7 +19,7 @@
import java.io.Serializable;
import java.util.Date;
import java.rmi.RemoteException;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface TimerStuff {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/TimerStuffImpl.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/TimerStuffImpl.java
index 484a5d6..e496337 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/TimerStuffImpl.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/TimerStuffImpl.java
@@ -23,7 +23,7 @@
import java.util.Date;
import java.util.Collection;
import java.util.Iterator;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.jms.JMSException;
import jakarta.jms.QueueConnectionFactory;
import jakarta.jms.QueueConnection;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/client/Client.java
index 594413d..a39e98a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/client/Client.java
@@ -18,7 +18,7 @@
import java.io.*;
import java.util.*;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
import javax.naming.*;
import javax.rmi.PortableRemoteObject;
import org.omg.CORBA.ORB;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/Foo.java b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/Foo.java
index c33f4d7..d11f14b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/Foo.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/Foo.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.txprop.cmttimeout;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.Remote;
import java.rmi.RemoteException;
import java.io.Serializable;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/FooBean.java b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/FooBean.java
index 257e50a..a9d12cc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/FooBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/FooBean.java
@@ -19,9 +19,9 @@
import java.util.Enumeration;
import java.io.Serializable;
import java.rmi.RemoteException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
import javax.naming.*;
import javax.rmi.PortableRemoteObject;
import com.sun.s1asdev.ejb.txprop.cmttimeout.HelloHome;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/Hello.java
index 70e181f..9906a47 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/Hello.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.txprop.cmttimeout;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.Remote;
import java.rmi.RemoteException;
import java.io.Serializable;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/HelloBean.java b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/HelloBean.java
index 3a88f5d..80a9db8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/HelloBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/HelloBean.java
@@ -19,9 +19,9 @@
import java.util.Enumeration;
import java.io.Serializable;
import java.rmi.RemoteException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
public class HelloBean implements SessionBean {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/HelloHome.java b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/HelloHome.java
index b33c8cc..dedcaef 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/HelloHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/HelloHome.java
@@ -19,8 +19,8 @@
import java.io.Serializable;
import java.rmi.Remote;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface HelloHome extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleEntityBean.java b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleEntityBean.java
index aecfc84..ccd911c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleEntityBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleEntityBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.bmp;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.rmi.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleEntityHome.java b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleEntityHome.java
index a170e3f..c56a4b8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleEntityHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleEntityHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.bmp;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleEntityHome
diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleEntityLocal.java b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleEntityLocal.java
index 01c7cdf..9d8aa51 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleEntityLocal.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleEntityLocal.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.bmp;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleEntityLocal
diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleEntityLocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleEntityLocalHome.java
index 709ff50..84dc19e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleEntityLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleEntityLocalHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.bmp;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleEntityLocalHome
diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleEntityRemote.java b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleEntityRemote.java
index bb63e05..64c16dd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleEntityRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleEntityRemote.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.bmp;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleEntityRemote
diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleSLSB.java b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleSLSB.java
index 938400e..bc9be2a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleSLSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleSLSB.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.slsb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.Remote;
import java.rmi.RemoteException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleSLSBBean.java b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleSLSBBean.java
index dc6beee..2717571 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleSLSBBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleSLSBBean.java
@@ -19,9 +19,9 @@
import java.util.Enumeration;
import java.io.Serializable;
import java.rmi.RemoteException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
public class SimpleSLSBBean
diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleSLSBHome.java b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleSLSBHome.java
index 85a6697..0d178f6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleSLSBHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleSLSBHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.slsb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.Remote;
import java.rmi.RemoteException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/client/Client.java
index 8d9aa68..9eedeeb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/client/Client.java
@@ -18,7 +18,7 @@
import java.io.*;
import java.util.*;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
import javax.naming.*;
import javax.rmi.PortableRemoteObject;
import org.omg.CORBA.ORB;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/Foo.java b/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/Foo.java
index 6dc3999..d9d4c44 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/Foo.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/Foo.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.txprop.simple;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.Remote;
import java.rmi.RemoteException;
import java.io.Serializable;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/FooBean.java b/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/FooBean.java
index 19d3e5a..05982de 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/FooBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/FooBean.java
@@ -20,10 +20,10 @@
import java.util.Collection;
import java.io.Serializable;
import java.rmi.RemoteException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
-import javax.ejb.TimerService;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.TimerService;
import javax.naming.*;
import javax.rmi.PortableRemoteObject;
import javax.transaction.UserTransaction;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/FooHome.java b/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/FooHome.java
index ec05abd..5b12d35 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/FooHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/FooHome.java
@@ -19,8 +19,8 @@
import java.io.Serializable;
import java.rmi.Remote;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface FooHome extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/Hello.java
index 5a91b7d..766a254 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/Hello.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.txprop.simple;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.Remote;
import java.rmi.RemoteException;
import java.io.Serializable;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/HelloBean.java b/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/HelloBean.java
index bf3ddf7..a2ebe78 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/HelloBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/HelloBean.java
@@ -19,9 +19,9 @@
import java.util.Enumeration;
import java.io.Serializable;
import java.rmi.RemoteException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
public class HelloBean implements SessionBean {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/HelloHome.java b/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/HelloHome.java
index 17cf1a4..d1a77e5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/HelloHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/HelloHome.java
@@ -19,8 +19,8 @@
import java.io.Serializable;
import java.rmi.Remote;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
public interface HelloHome extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/client/MethodMapTest.java b/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/client/MethodMapTest.java
index b5d7152..c30a6ce 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/client/MethodMapTest.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/client/MethodMapTest.java
@@ -34,10 +34,10 @@
java.lang.Object.class,
MethodMapTest1.class, MethodMapTest2.class, MethodMapTest3.class,
MethodMapTest4.class, MethodMapTest3.class, MethodMapTest6.class,
- MethodMapTest.class, javax.ejb.EJBHome.class,
- javax.ejb.EJBObject.class, javax.ejb.EJBLocalObject.class,
- javax.ejb.EJBLocalHome.class, javax.ejb.SessionBean.class,
- javax.ejb.EnterpriseBean.class, java.util.Map.class,
+ MethodMapTest.class, jakarta.ejb.EJBHome.class,
+ jakarta.ejb.EJBObject.class, jakarta.ejb.EJBLocalObject.class,
+ jakarta.ejb.EJBLocalHome.class, jakarta.ejb.SessionBean.class,
+ jakarta.ejb.EnterpriseBean.class, java.util.Map.class,
jakarta.jms.QueueConnection.class, jakarta.jms.QueueSession.class,
jakarta.jms.Session.class, java.util.Date.class,
javax.swing.Action.class, javax.swing.AbstractAction.class,
diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/ejb/CommitBean.java b/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/ejb/CommitBean.java
index a538c06..4bb5274 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/ejb/CommitBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/ejb/CommitBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.webservice.commit;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.Resource;
import jakarta.jws.WebService;
import javax.sql.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/ejb/CommitStatefulBean.java b/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/ejb/CommitStatefulBean.java
index 09d9371..9bfe341 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/ejb/CommitStatefulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/ejb/CommitStatefulBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.webservice.commit;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.Resource;
@Stateful
diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/ejb/FooHome.java b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/ejb/FooHome.java
index f9a9b83..678759a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/ejb/FooHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/ejb/FooHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.webservice.ksink.googleserver;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
import java.rmi.RemoteException;
public interface FooHome extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/ejb/FooRemote.java b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/ejb/FooRemote.java
index ea2f385..d3483f4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/ejb/FooRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/ejb/FooRemote.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.webservice.ksink.googleserver;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
import java.rmi.RemoteException;
public interface FooRemote extends EJBObject, GoogleSearchPort {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/ejb/GoogleEJB.java b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/ejb/GoogleEJB.java
index abdcc9f..a05a977 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/ejb/GoogleEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/ejb/GoogleEJB.java
@@ -25,9 +25,9 @@
import javax.xml.rpc.Call;
import java.io.Serializable;
import java.rmi.RemoteException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
import javax.naming.*;
public class GoogleEJB implements SessionBean {
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/appauth/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/appauth/ejb/SimpleBMP.java
index 8a35fd0..aebcc48 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/appauth/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/appauth/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.appauth.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMP
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/appauth/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/appauth/ejb/SimpleBMPBean.java
index 64d7c9d..23bc657 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/appauth/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/appauth/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.appauth.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.sql.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/appauth/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/appauth/ejb/SimpleBMPHome.java
index 0d87796..40cba18 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/appauth/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/appauth/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.appauth.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMPHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/appauthtx/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/appauthtx/ejb/SimpleBMP.java
index e0db8ce..f7b7327 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/appauthtx/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/appauthtx/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.appauthtx.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMP
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/appauthtx/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/appauthtx/ejb/SimpleBMPBean.java
index ea35908..d49233d 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/appauthtx/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/appauthtx/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.appauthtx.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.rmi.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/appauthtx/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/appauthtx/ejb/SimpleBMPHome.java
index 1dd2c39..17a75cc 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/appauthtx/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/appauthtx/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.appauthtx.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMPHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/autocommit/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/autocommit/ejb/SimpleBMP.java
index a89e85d..4afc080 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/autocommit/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/autocommit/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.autocommit.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMP
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/autocommit/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/autocommit/ejb/SimpleBMPBean.java
index 4d6fa2b..50f1766 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/autocommit/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/autocommit/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.autocommit.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.rmi.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/autocommit/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/autocommit/ejb/SimpleBMPHome.java
index f0d300b..e7a250d 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/autocommit/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/autocommit/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.autocommit.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMPHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/cmpsimple/ejb/BlobTest.java b/appserver/tests/appserv-tests/devtests/jdbc/cmpsimple/ejb/BlobTest.java
index 04fc199..3e7e33b 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/cmpsimple/ejb/BlobTest.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/cmpsimple/ejb/BlobTest.java
@@ -16,14 +16,14 @@
package com.sun.s1asdev.jdbc.cmpsimple.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.util.*;
/**
* @author mvatkina
*/
-public interface BlobTest extends javax.ejb.EJBObject {
+public interface BlobTest extends jakarta.ejb.EJBObject {
public String getName() throws java.rmi.RemoteException;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/cmpsimple/ejb/BlobTestBean.java b/appserver/tests/appserv-tests/devtests/jdbc/cmpsimple/ejb/BlobTestBean.java
index dc46eb1..7822a4a 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/cmpsimple/ejb/BlobTestBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/cmpsimple/ejb/BlobTestBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.cmpsimple.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
/**
@@ -24,21 +24,21 @@
*/
-public abstract class BlobTestBean implements javax.ejb.EntityBean {
+public abstract class BlobTestBean implements jakarta.ejb.EntityBean {
- private javax.ejb.EntityContext context;
+ private jakarta.ejb.EntityContext context;
/**
- * @see javax.ejb.EntityBean#setEntityContext(javax.ejb.EntityContext)
+ * @see jakarta.ejb.EntityBean#setEntityContext(jakarta.ejb.EntityContext)
*/
- public void setEntityContext(javax.ejb.EntityContext aContext) {
+ public void setEntityContext(jakarta.ejb.EntityContext aContext) {
context=aContext;
}
/**
- * @see javax.ejb.EntityBean#ejbActivate()
+ * @see jakarta.ejb.EntityBean#ejbActivate()
*/
public void ejbActivate() {
@@ -46,7 +46,7 @@
/**
- * @see javax.ejb.EntityBean#ejbPassivate()
+ * @see jakarta.ejb.EntityBean#ejbPassivate()
*/
public void ejbPassivate() {
@@ -54,7 +54,7 @@
/**
- * @see javax.ejb.EntityBean#ejbRemove()
+ * @see jakarta.ejb.EntityBean#ejbRemove()
*/
public void ejbRemove() {
System.out.println("Debug: BlobTest ejbRemove");
@@ -62,7 +62,7 @@
/**
- * @see javax.ejb.EntityBean#unsetEntityContext()
+ * @see jakarta.ejb.EntityBean#unsetEntityContext()
*/
public void unsetEntityContext() {
context=null;
@@ -70,7 +70,7 @@
/**
- * @see javax.ejb.EntityBean#ejbLoad()
+ * @see jakarta.ejb.EntityBean#ejbLoad()
*/
public void ejbLoad() {
@@ -78,7 +78,7 @@
/**
- * @see javax.ejb.EntityBean#ejbStore()
+ * @see jakarta.ejb.EntityBean#ejbStore()
*/
public void ejbStore() {
@@ -95,7 +95,7 @@
public abstract void setBlb(byte[] b);
- public java.lang.Integer ejbCreate(Integer id, java.lang.String name, byte[] b) throws javax.ejb.CreateException {
+ public java.lang.Integer ejbCreate(Integer id, java.lang.String name, byte[] b) throws jakarta.ejb.CreateException {
setId(id);
setName(name);
setBlb(b);
@@ -104,7 +104,7 @@
}
*/
public java.lang.Integer ejbCreate(Integer id, java.lang.String name)
- throws javax.ejb.CreateException
+ throws jakarta.ejb.CreateException
{
setId(id);
setName(name);
@@ -113,10 +113,10 @@
}
/*
- public void ejbPostCreate(Integer id, java.lang.String name, byte[] b) throws javax.ejb.CreateException {
+ public void ejbPostCreate(Integer id, java.lang.String name, byte[] b) throws jakarta.ejb.CreateException {
}
*/
public void ejbPostCreate(Integer id, java.lang.String name )
- throws javax.ejb.CreateException {}
+ throws jakarta.ejb.CreateException {}
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/cmpsimple/ejb/BlobTestHome.java b/appserver/tests/appserv-tests/devtests/jdbc/cmpsimple/ejb/BlobTestHome.java
index 7e7901b..562f1f5 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/cmpsimple/ejb/BlobTestHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/cmpsimple/ejb/BlobTestHome.java
@@ -16,22 +16,22 @@
package com.sun.s1asdev.jdbc.cmpsimple.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.util.*;
/**
* @author mvatkina
*/
-public interface BlobTestHome extends javax.ejb.EJBHome {
+public interface BlobTestHome extends jakarta.ejb.EJBHome {
/*
- public BlobTest create(Integer i, java.lang.String name, byte[] b) throws java.rmi.RemoteException, javax.ejb.CreateException;
+ public BlobTest create(Integer i, java.lang.String name, byte[] b) throws java.rmi.RemoteException, jakarta.ejb.CreateException;
- public BlobTest findByPrimaryKey (Integer key) throws java.rmi.RemoteException, javax.ejb.FinderException;
+ public BlobTest findByPrimaryKey (Integer key) throws java.rmi.RemoteException, jakarta.ejb.FinderException;
*/
public BlobTest create(Integer i, java.lang.String name)
- throws java.rmi.RemoteException, javax.ejb.CreateException;
+ throws java.rmi.RemoteException, jakarta.ejb.CreateException;
public BlobTest findByPrimaryKey (Integer key)
- throws java.rmi.RemoteException, javax.ejb.FinderException;
+ throws java.rmi.RemoteException, jakarta.ejb.FinderException;
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/conncreationretry/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/conncreationretry/ejb/SimpleBMP.java
index 3a64247..51d4374 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/conncreationretry/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/conncreationretry/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.connectioncreationretry.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMP
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/conncreationretry/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/conncreationretry/ejb/SimpleBMPBean.java
index 94fb0c6..cd1d898 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/conncreationretry/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/conncreationretry/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.connectioncreationretry.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.sql.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/conncreationretry/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/conncreationretry/ejb/SimpleBMPHome.java
index 55736d0..1a4cf1e 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/conncreationretry/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/conncreationretry/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.connectioncreationretry.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMPHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/ejb/NestedBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/ejb/NestedBMP.java
index 00bfff3..092f7d6 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/ejb/NestedBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/ejb/NestedBMP.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.statementwrapper.ejb;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
import java.rmi.RemoteException;
public interface NestedBMP extends EJBObject {
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/ejb/NestedBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/ejb/NestedBMPBean.java
index b051a10..86ba70b 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/ejb/NestedBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/ejb/NestedBMPBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.statementwrapper.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/ejb/NestedBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/ejb/NestedBMPHome.java
index 0bdbb18..7551f20 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/ejb/NestedBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/ejb/NestedBMPHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.statementwrapper.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface NestedBMPHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/ejb/SimpleBMP.java
index 7f2e5f0..893d507 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.statementwrapper.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMP
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/ejb/SimpleBMPBean.java
index 0016690..81a9848 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.statementwrapper.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import com.sun.appserv.jdbc.DataSource;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/ejb/SimpleBMPHome.java
index 54d3810..8ddafb3 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.statementwrapper.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMPHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connleakreclaimnotify/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/connleakreclaimnotify/ejb/SimpleBMP.java
index f113a0b..6fa8e98 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/connleakreclaimnotify/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connleakreclaimnotify/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.statementwrapper.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMP
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connleakreclaimnotify/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/connleakreclaimnotify/ejb/SimpleBMPBean.java
index df28f3a..4857269 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/connleakreclaimnotify/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connleakreclaimnotify/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.statementwrapper.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.sql.*;
@@ -26,7 +26,7 @@
implements SessionBean {
protected DataSource ds;
- private transient javax.ejb.SessionContext m_ctx = null;
+ private transient jakarta.ejb.SessionContext m_ctx = null;
public void setSessionContext(SessionContext context) {
m_ctx = context;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connleakreclaimnotify/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/connleakreclaimnotify/ejb/SimpleBMPHome.java
index 90b8139..80ac959 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/connleakreclaimnotify/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connleakreclaimnotify/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.statementwrapper.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMPHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connleaktracing/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/connleaktracing/ejb/SimpleBMP.java
index 5b34022..aac554c 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/connleaktracing/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connleaktracing/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.connectionleaktracing.ejb;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
import java.rmi.RemoteException;
public interface SimpleBMP extends EJBObject {
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connleaktracing/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/connleaktracing/ejb/SimpleBMPBean.java
index 3bd8e60..98a69ed 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/connleaktracing/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connleaktracing/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.connectionleaktracing.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.sql.*;
@@ -25,7 +25,7 @@
implements SessionBean {
protected DataSource ds;
- private transient javax.ejb.SessionContext m_ctx = null;
+ private transient jakarta.ejb.SessionContext m_ctx = null;
public void setSessionContext(SessionContext context) {
m_ctx = context;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connleaktracing/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/connleaktracing/ejb/SimpleBMPHome.java
index 0426856..3eca924 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/connleaktracing/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connleaktracing/ejb/SimpleBMPHome.java
@@ -16,9 +16,9 @@
package com.sun.s1asdev.jdbc.connectionleaktracing.ejb;
-import javax.ejb.CreateException;
+import jakarta.ejb.CreateException;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
public interface SimpleBMPHome
extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/ejb/SimpleSession.java b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/ejb/SimpleSession.java
index d44b495..8bbc663 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/ejb/SimpleSession.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/ejb/SimpleSession.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.connsharing.nonxa.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleSession extends EJBObject {
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/ejb/SimpleSession2.java b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/ejb/SimpleSession2.java
index 1940e83..fbce741 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/ejb/SimpleSession2.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/ejb/SimpleSession2.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.connsharing.nonxa.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleSession2 extends EJBObject {
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/ejb/SimpleSession2Bean.java b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/ejb/SimpleSession2Bean.java
index 1a2ecaa..9c67853 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/ejb/SimpleSession2Bean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/ejb/SimpleSession2Bean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.connsharing.nonxa.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.rmi.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/ejb/SimpleSession2Home.java b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/ejb/SimpleSession2Home.java
index f5e3a5d..c0762da 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/ejb/SimpleSession2Home.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/ejb/SimpleSession2Home.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.connsharing.nonxa.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleSession2Home extends EJBHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/ejb/SimpleSessionBean.java
index d808309..1621b2b 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/ejb/SimpleSessionBean.java
@@ -19,7 +19,7 @@
import jakarta.annotation.Resource;
import javax.naming.*;
import javax.sql.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.sql.*;
import java.util.Set;
import java.util.HashSet;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/ejb/SimpleSessionHome.java b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/ejb/SimpleSessionHome.java
index d45f67e..1e41c2b 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/ejb/SimpleSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/ejb/SimpleSessionHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.connsharing.nonxa.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleSessionHome extends EJBHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/ejb/SimpleSession.java b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/ejb/SimpleSession.java
index 0b4001f..b9b8f5f 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/ejb/SimpleSession.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/ejb/SimpleSession.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.connsharing.xa.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleSession extends EJBObject {
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/ejb/SimpleSession2.java b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/ejb/SimpleSession2.java
index 5a0e84e..177efe1 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/ejb/SimpleSession2.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/ejb/SimpleSession2.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.connsharing.xa.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleSession2 extends EJBObject {
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/ejb/SimpleSession2Bean.java b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/ejb/SimpleSession2Bean.java
index b688d08..3df9a79 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/ejb/SimpleSession2Bean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/ejb/SimpleSession2Bean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.connsharing.xa.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.rmi.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/ejb/SimpleSession2Home.java b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/ejb/SimpleSession2Home.java
index c8af061..860b8eb 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/ejb/SimpleSession2Home.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/ejb/SimpleSession2Home.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.connsharing.xa.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleSession2Home extends EJBHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/ejb/SimpleSessionBean.java
index 7034666..0579802 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/ejb/SimpleSessionBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.connsharing.xa.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.rmi.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/ejb/SimpleSessionHome.java b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/ejb/SimpleSessionHome.java
index b31d0fd..c0f6e74 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/ejb/SimpleSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/ejb/SimpleSessionHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.connsharing.xa.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleSessionHome extends EJBHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/contauth/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/contauth/ejb/SimpleBMP.java
index a4288c1..02500c9 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/contauth/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/contauth/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.contauth.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMP
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/contauth/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/contauth/ejb/SimpleBMPBean.java
index 91da4b5..5ceec41 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/contauth/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/contauth/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.contauth.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.rmi.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/contauth/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/contauth/ejb/SimpleBMPHome.java
index 468c5a0..c5b7a0b 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/contauth/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/contauth/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.contauth.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMPHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/contauth1/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/contauth1/ejb/SimpleBMP.java
index 3dfba15..beefc2c 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/contauth1/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/contauth1/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.contauth1.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMP
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/contauth1/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/contauth1/ejb/SimpleBMPBean.java
index 16f2bef..004b8d3 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/contauth1/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/contauth1/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.contauth1.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.rmi.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/contauth1/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/contauth1/ejb/SimpleBMPHome.java
index 270d330..357503d 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/contauth1/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/contauth1/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.contauth1.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMPHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/contauth1tx/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/contauth1tx/ejb/SimpleBMP.java
index 79a1fec..c73f7ce 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/contauth1tx/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/contauth1tx/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.contauth1tx.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMP
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/contauth1tx/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/contauth1tx/ejb/SimpleBMPBean.java
index 9f8c701..6fc6da8 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/contauth1tx/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/contauth1tx/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.contauth1tx.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.rmi.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/contauth1tx/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/contauth1tx/ejb/SimpleBMPHome.java
index 097f172..1bbe163 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/contauth1tx/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/contauth1tx/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.contauth1tx.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMPHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/contauthtx/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/contauthtx/ejb/SimpleBMP.java
index 1faf1fc..24c1a08 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/contauthtx/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/contauthtx/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.contauthtx.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMP
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/contauthtx/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/contauthtx/ejb/SimpleBMPBean.java
index ffada48..f12be1f 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/contauthtx/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/contauthtx/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.contauthtx.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.rmi.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/contauthtx/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/contauthtx/ejb/SimpleBMPHome.java
index e8de6ba..6fff2a0 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/contauthtx/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/contauthtx/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.contauthtx.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMPHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/conval/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/conval/ejb/SimpleBMP.java
index b65d5b0..18b745c 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/conval/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/conval/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.conval.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMP
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/conval/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/conval/ejb/SimpleBMPBean.java
index 328863b..7d83311 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/conval/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/conval/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.conval.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.rmi.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/conval/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/conval/ejb/SimpleBMPHome.java
index 5ef3b94..24b40c3 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/conval/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/conval/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.conval.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMPHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/cpds/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/cpds/ejb/SimpleBMP.java
index 3464e4f..f48e410 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/cpds/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/cpds/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.cpds.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMP
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/cpds/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/cpds/ejb/SimpleBMPBean.java
index 1d8f96b..99e1269 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/cpds/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/cpds/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.cpds.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.sql.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/cpds/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/cpds/ejb/SimpleBMPHome.java
index 97db125..fa42df2 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/cpds/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/cpds/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.cpds.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMPHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/cpdsperf/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/cpdsperf/ejb/SimpleBMP.java
index 1cce3cb..49f107f 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/cpdsperf/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/cpdsperf/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.cpdsperf.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMP
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/cpdsperf/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/cpdsperf/ejb/SimpleBMPBean.java
index 685813a..a08964d 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/cpdsperf/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/cpdsperf/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.cpdsperf.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.rmi.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/cpdsperf/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/cpdsperf/ejb/SimpleBMPHome.java
index a1a1ada..2994a65 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/cpdsperf/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/cpdsperf/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.cpdsperf.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMPHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/custom-validation-1/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/custom-validation-1/ejb/SimpleBMP.java
index 66a2ed7..38863d4 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/custom-validation-1/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/custom-validation-1/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.customval.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMP
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/custom-validation-1/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/custom-validation-1/ejb/SimpleBMPBean.java
index f8b4fce..96940bd 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/custom-validation-1/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/custom-validation-1/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.customval.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.rmi.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/custom-validation-1/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/custom-validation-1/ejb/SimpleBMPHome.java
index 1229443..b155b5b 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/custom-validation-1/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/custom-validation-1/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.customval.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMPHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/custom-validation/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/custom-validation/ejb/SimpleBMP.java
index 66a2ed7..38863d4 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/custom-validation/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/custom-validation/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.customval.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMP
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/custom-validation/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/custom-validation/ejb/SimpleBMPBean.java
index f8b4fce..96940bd 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/custom-validation/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/custom-validation/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.customval.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.rmi.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/custom-validation/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/custom-validation/ejb/SimpleBMPHome.java
index 1229443..b155b5b 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/custom-validation/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/custom-validation/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.customval.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMPHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/datasource40/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/datasource40/ejb/SimpleBMP.java
index 6f007d0..1e9aa4c 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/datasource40/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/datasource40/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.datasource40.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMP
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/datasource40/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/datasource40/ejb/SimpleBMPBean.java
index 776ccf1..c6dbe6d 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/datasource40/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/datasource40/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.datasource40.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.sql.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/datasource40/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/datasource40/ejb/SimpleBMPHome.java
index fc13c03..606f4e8 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/datasource40/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/datasource40/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.datasource40.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMPHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.markconnectionasbad.xa/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.markconnectionasbad.xa/ejb/SimpleBMP.java
index 32b2dd7..ac28659 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.markconnectionasbad.xa/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.markconnectionasbad.xa/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.markconnectionasbad.xa.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
import java.util.Set;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.markconnectionasbad.xa/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.markconnectionasbad.xa/ejb/SimpleBMPBean.java
index f559683..0e6f501 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.markconnectionasbad.xa/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.markconnectionasbad.xa/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.markconnectionasbad.xa.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import java.sql.Connection;
import java.sql.Statement;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.markconnectionasbad.xa/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.markconnectionasbad.xa/ejb/SimpleBMPHome.java
index 402f66a..15ebcb1 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.markconnectionasbad.xa/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.markconnectionasbad.xa/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.markconnectionasbad.xa.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMPHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test1/ejb/SimpleSession.java b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test1/ejb/SimpleSession.java
index de2650b..939b866 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test1/ejb/SimpleSession.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test1/ejb/SimpleSession.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.dmmcfnotxconn.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
public interface SimpleSession extends EJBObject {
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test1/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test1/ejb/SimpleSessionBean.java
index e70743b..d70b434 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test1/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test1/ejb/SimpleSessionBean.java
@@ -19,7 +19,7 @@
import java.util.*;
import java.io.*;
import java.rmi.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.transaction.UserTransaction;
import javax.naming.*;
import javax.sql.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test1/ejb/SimpleSessionHome.java b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test1/ejb/SimpleSessionHome.java
index 857b879..8866ab5 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test1/ejb/SimpleSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test1/ejb/SimpleSessionHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.dmmcfnotxconn.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
public interface SimpleSessionHome extends EJBHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test2/ejb/SimpleSession.java b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test2/ejb/SimpleSession.java
index 04fc093..949183b 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test2/ejb/SimpleSession.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test2/ejb/SimpleSession.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.dmmcfnotxconn.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
public interface SimpleSession extends EJBObject {
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test2/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test2/ejb/SimpleSessionBean.java
index 654dc82..c9d3d0a 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test2/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test2/ejb/SimpleSessionBean.java
@@ -19,7 +19,7 @@
import java.util.*;
import java.io.*;
import java.rmi.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.transaction.UserTransaction;
import javax.naming.*;
import javax.sql.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test2/ejb/SimpleSessionHome.java b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test2/ejb/SimpleSessionHome.java
index 857b879..8866ab5 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test2/ejb/SimpleSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test2/ejb/SimpleSessionHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.dmmcfnotxconn.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
public interface SimpleSessionHome extends EJBHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/ejb/SimpleSession.java b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/ejb/SimpleSession.java
index 2871750..c72d2ad 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/ejb/SimpleSession.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/ejb/SimpleSession.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.dmmcf.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleSession extends EJBObject {
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/ejb/SimpleSession2.java b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/ejb/SimpleSession2.java
index 4b1c1b8..8f4cba2 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/ejb/SimpleSession2.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/ejb/SimpleSession2.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.dmmcf.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleSession2 extends EJBObject {
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/ejb/SimpleSession2Bean.java b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/ejb/SimpleSession2Bean.java
index a32defb..fc8fba0 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/ejb/SimpleSession2Bean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/ejb/SimpleSession2Bean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.dmmcf.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.rmi.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/ejb/SimpleSession2Home.java b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/ejb/SimpleSession2Home.java
index c7125e7..3c5140a 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/ejb/SimpleSession2Home.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/ejb/SimpleSession2Home.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.dmmcf.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleSession2Home extends EJBHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/ejb/SimpleSessionBean.java
index 793e762..7dbae30 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/ejb/SimpleSessionBean.java
@@ -18,7 +18,7 @@
import javax.naming.*;
import javax.sql.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.sql.*;
import java.util.Set;
import java.util.HashSet;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/ejb/SimpleSessionHome.java b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/ejb/SimpleSessionHome.java
index b2c8b38..92573ab 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/ejb/SimpleSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/ejb/SimpleSessionHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.dmmcf.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleSessionHome extends EJBHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/fetchoutofseq/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/fetchoutofseq/ejb/SimpleBMP.java
index c564a05..ad006c0 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/fetchoutofseq/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/fetchoutofseq/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.fetchoutofseq.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMP
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/fetchoutofseq/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/fetchoutofseq/ejb/SimpleBMPBean.java
index e8a5bec..c7f97de 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/fetchoutofseq/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/fetchoutofseq/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.fetchoutofseq.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.rmi.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/fetchoutofseq/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/fetchoutofseq/ejb/SimpleBMPHome.java
index fa5073a..6c9e2fe 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/fetchoutofseq/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/fetchoutofseq/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.fetchoutofseq.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMPHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/flushconnectionpool/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/flushconnectionpool/ejb/SimpleBMP.java
index 2bd3241..6f33505 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/flushconnectionpool/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/flushconnectionpool/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.flushconnectionpool.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMP
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/flushconnectionpool/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/flushconnectionpool/ejb/SimpleBMPBean.java
index 352c4be..00b6470 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/flushconnectionpool/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/flushconnectionpool/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.flushconnectionpool.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import java.sql.*;
import java.util.Map;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/flushconnectionpool/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/flushconnectionpool/ejb/SimpleBMPHome.java
index 42613f3..923c7c5 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/flushconnectionpool/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/flushconnectionpool/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.flushconnectionpool.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMPHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/init-sql/ejb/SimpleSession.java b/appserver/tests/appserv-tests/devtests/jdbc/init-sql/ejb/SimpleSession.java
index 7d18d55..2e3c305 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/init-sql/ejb/SimpleSession.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/init-sql/ejb/SimpleSession.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.initsql.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
import javax.sql.DataSource;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/init-sql/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/jdbc/init-sql/ejb/SimpleSessionBean.java
index 2daf55f..0325651 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/init-sql/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/init-sql/ejb/SimpleSessionBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.initsql.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.rmi.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/init-sql/ejb/SimpleSessionHome.java b/appserver/tests/appserv-tests/devtests/jdbc/init-sql/ejb/SimpleSessionHome.java
index 03959a2..410b9aa 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/init-sql/ejb/SimpleSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/init-sql/ejb/SimpleSessionHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.initsql.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleSessionHome extends EJBHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/basic/ejb/SimpleSession.java b/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/basic/ejb/SimpleSession.java
index 382600d..4df6e35 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/basic/ejb/SimpleSession.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/basic/ejb/SimpleSession.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc41.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleSession extends EJBObject {
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/basic/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/basic/ejb/SimpleSessionBean.java
index b1af4f7..91f0b22 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/basic/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/basic/ejb/SimpleSessionBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc41.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.rmi.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/basic/ejb/SimpleSessionHome.java b/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/basic/ejb/SimpleSessionHome.java
index 52802db..5b59f03 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/basic/ejb/SimpleSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/basic/ejb/SimpleSessionHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc41.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleSessionHome extends EJBHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/closeoncompletion.stmtcaching/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/closeoncompletion.stmtcaching/ejb/SimpleBMP.java
index 9f0958c..5ceba55 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/closeoncompletion.stmtcaching/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/closeoncompletion.stmtcaching/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.stmtcaching.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMP
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/closeoncompletion.stmtcaching/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/closeoncompletion.stmtcaching/ejb/SimpleBMPBean.java
index 52e868a..7445272 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/closeoncompletion.stmtcaching/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/closeoncompletion.stmtcaching/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.stmtcaching.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import java.sql.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/closeoncompletion.stmtcaching/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/closeoncompletion.stmtcaching/ejb/SimpleBMPHome.java
index ce6dd96..44de1ce 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/closeoncompletion.stmtcaching/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/closeoncompletion.stmtcaching/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.stmtcaching.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMPHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/JmsAuth.java b/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/JmsAuth.java
index 3f45def..5e1de7c 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/JmsAuth.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/JmsAuth.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.jdbcjmsauth.ejb;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
import java.rmi.RemoteException;
public interface JmsAuth extends EJBObject {
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/JmsAuthBean.java b/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/JmsAuthBean.java
index e87a87c..03cd8f4 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/JmsAuthBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/JmsAuthBean.java
@@ -16,9 +16,9 @@
package com.sun.s1asdev.jdbc.jdbcjmsauth.ejb;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.CreateException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.CreateException;
import jakarta.jms.QueueConnectionFactory;
import jakarta.jms.QueueConnection;
import jakarta.jms.QueueSession;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/JmsAuthHome.java b/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/JmsAuthHome.java
index 0a30eaa..9e6be29 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/JmsAuthHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/JmsAuthHome.java
@@ -16,9 +16,9 @@
package com.sun.s1asdev.jdbc.jdbcjmsauth.ejb;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
import java.rmi.RemoteException;
-import javax.ejb.CreateException;
+import jakarta.ejb.CreateException;
public interface JmsAuthHome extends EJBHome {
public JmsAuth create() throws CreateException, RemoteException;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/SimpleBMP.java
index 628e95e..82e4ac1 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.jdbcjmsauth.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMP
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/SimpleBMPBean.java
index d810e53..d1cf55c 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.jdbcjmsauth.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.rmi.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/SimpleBMPHome.java
index 7815ed9..b258729 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.jdbcjmsauth.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMPHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/client/Client.java b/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/client/Client.java
index 7874966..b1ac27a 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/client/Client.java
@@ -19,7 +19,7 @@
import java.io.*;
import java.util.*;
import java.sql.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import javax.transaction.UserTransaction;
import jakarta.annotation.*;
import jakarta.annotation.sql.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/Sful.java
index 4c970be..06e0dc5 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/Sful.java
@@ -18,7 +18,7 @@
import java.util.Map;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface Sful {
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/SfulBean.java b/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/SfulBean.java
index fbeb5e8..7702526 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/SfulBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/SfulBean.java
@@ -21,8 +21,8 @@
import javax.naming.InitialContext;
-import javax.ejb.Stateful;
-import javax.ejb.EJB;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.EJB;
import javax.persistence.PersistenceContextType;
import javax.persistence.PersistenceContext;
import javax.persistence.EntityNotFoundException;
@@ -30,9 +30,9 @@
import javax.persistence.EntityManager;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.ejb.EJBException;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
+import jakarta.ejb.EJBException;
@DataSourceDefinition(name = "java:app/jdbc/xa",
className = "org.apache.derby.jdbc.ClientXADataSource",
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/SfulDelegate.java b/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/SfulDelegate.java
index 03e7f74..de756e7 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/SfulDelegate.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/SfulDelegate.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.persistence.tx_propagation;
-import javax.ejb.Local;
+import jakarta.ejb.Local;
import javax.persistence.EntityManager;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/SfulDelegateBean.java b/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/SfulDelegateBean.java
index f06f15c..714510f 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/SfulDelegateBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/SfulDelegateBean.java
@@ -16,14 +16,14 @@
package com.sun.s1asdev.ejb.ejb30.persistence.tx_propagation;
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
import javax.persistence.PersistenceContextType;
import javax.persistence.PersistenceContext;
import javax.persistence.EntityNotFoundException;
import javax.persistence.EntityManager;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
@Stateful
public class SfulDelegateBean
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/lazyassoc/ejb/SimpleSession.java b/appserver/tests/appserv-tests/devtests/jdbc/lazyassoc/ejb/SimpleSession.java
index ebb4fb1..bd5737f 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/lazyassoc/ejb/SimpleSession.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/lazyassoc/ejb/SimpleSession.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.lazyassoc.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleSession extends EJBObject {
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/lazyassoc/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/jdbc/lazyassoc/ejb/SimpleSessionBean.java
index 51c409f..58ac355 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/lazyassoc/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/lazyassoc/ejb/SimpleSessionBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.lazyassoc.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.rmi.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/lazyassoc/ejb/SimpleSessionHome.java b/appserver/tests/appserv-tests/devtests/jdbc/lazyassoc/ejb/SimpleSessionHome.java
index 5f47ed4..40f39ac 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/lazyassoc/ejb/SimpleSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/lazyassoc/ejb/SimpleSessionHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.lazyassoc.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleSessionHome extends EJBHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.local/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.local/ejb/SimpleBMP.java
index 21e4927..5f72871 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.local/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.local/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.markconnectionasbad.local.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
import java.sql.Connection;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.local/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.local/ejb/SimpleBMPBean.java
index b5dc135..8619ce3 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.local/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.local/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.markconnectionasbad.local.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import java.sql.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.local/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.local/ejb/SimpleBMPHome.java
index 7e41175..0ecef35 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.local/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.local/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.markconnectionasbad.local.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMPHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.xa/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.xa/ejb/SimpleBMP.java
index 1557bfa..491fb94 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.xa/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.xa/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.markconnectionasbad.xa.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMP extends EJBObject {
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.xa/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.xa/ejb/SimpleBMPBean.java
index e09173a..2c90245 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.xa/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.xa/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.markconnectionasbad.xa.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import java.sql.Connection;
import java.sql.Statement;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.xa/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.xa/ejb/SimpleBMPHome.java
index 402f66a..15ebcb1 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.xa/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.xa/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.markconnectionasbad.xa.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMPHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/maxconnectionusage/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/maxconnectionusage/ejb/SimpleBMP.java
index f1f5385..a73bc8c 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/maxconnectionusage/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/maxconnectionusage/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.maxconnectionusage.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMP
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/maxconnectionusage/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/maxconnectionusage/ejb/SimpleBMPBean.java
index 1e8ad4e..04da364 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/maxconnectionusage/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/maxconnectionusage/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.maxconnectionusage.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import java.sql.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/maxconnectionusage/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/maxconnectionusage/ejb/SimpleBMPHome.java
index 76cbff1..3e8f4e1 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/maxconnectionusage/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/maxconnectionusage/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.maxconnectionusage.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMPHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/multiplecloseconnection/ejb/SimpleSession.java b/appserver/tests/appserv-tests/devtests/jdbc/multiplecloseconnection/ejb/SimpleSession.java
index 999bd46..f059d00 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/multiplecloseconnection/ejb/SimpleSession.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/multiplecloseconnection/ejb/SimpleSession.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.multiplecloseconnection.ejb;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
import java.rmi.RemoteException;
public interface SimpleSession extends EJBObject {
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/multiplecloseconnection/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/jdbc/multiplecloseconnection/ejb/SimpleSessionBean.java
index 23491a2..f2e94c0 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/multiplecloseconnection/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/multiplecloseconnection/ejb/SimpleSessionBean.java
@@ -16,9 +16,9 @@
package com.sun.s1asdev.jdbc.multiplecloseconnection.ejb;
-import javax.ejb.CreateException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
import javax.naming.InitialContext;
import javax.naming.NamingException;
import javax.sql.DataSource;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/multiplecloseconnection/ejb/SimpleSessionHome.java b/appserver/tests/appserv-tests/devtests/jdbc/multiplecloseconnection/ejb/SimpleSessionHome.java
index be59bc4..85997fa 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/multiplecloseconnection/ejb/SimpleSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/multiplecloseconnection/ejb/SimpleSessionHome.java
@@ -16,8 +16,8 @@
package com.sun.s1asdev.jdbc.multiplecloseconnection.ejb;
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBHome;
import java.rmi.RemoteException;
public interface SimpleSessionHome extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/multipleusercredentials/ejb/SimpleSession.java b/appserver/tests/appserv-tests/devtests/jdbc/multipleusercredentials/ejb/SimpleSession.java
index 8a2fbc9..988db48 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/multipleusercredentials/ejb/SimpleSession.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/multipleusercredentials/ejb/SimpleSession.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.multipleusercredentials.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleSession extends EJBObject {
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/multipleusercredentials/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/jdbc/multipleusercredentials/ejb/SimpleSessionBean.java
index 7b5d964..4b0c64d 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/multipleusercredentials/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/multipleusercredentials/ejb/SimpleSessionBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.multipleusercredentials.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.sql.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/multipleusercredentials/ejb/SimpleSessionHome.java b/appserver/tests/appserv-tests/devtests/jdbc/multipleusercredentials/ejb/SimpleSessionHome.java
index 81c9503..494377f 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/multipleusercredentials/ejb/SimpleSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/multipleusercredentials/ejb/SimpleSessionHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.multipleusercredentials.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleSessionHome extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/nopasswdfordb/ejb/SimpleSession.java b/appserver/tests/appserv-tests/devtests/jdbc/nopasswdfordb/ejb/SimpleSession.java
index cc40566..0eb8aee 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/nopasswdfordb/ejb/SimpleSession.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/nopasswdfordb/ejb/SimpleSession.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.nopasswdfordb.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleSession extends EJBObject {
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/nopasswdfordb/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/jdbc/nopasswdfordb/ejb/SimpleSessionBean.java
index ac10b84..c73367e 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/nopasswdfordb/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/nopasswdfordb/ejb/SimpleSessionBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.nopasswdfordb.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.rmi.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/nopasswdfordb/ejb/SimpleSessionHome.java b/appserver/tests/appserv-tests/devtests/jdbc/nopasswdfordb/ejb/SimpleSessionHome.java
index c32518e..6275382 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/nopasswdfordb/ejb/SimpleSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/nopasswdfordb/ejb/SimpleSessionHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.nopasswdfordb.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleSessionHome extends EJBHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test1/ejb/SimpleSession.java b/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test1/ejb/SimpleSession.java
index ce5abee..891527c 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test1/ejb/SimpleSession.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test1/ejb/SimpleSession.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.notxconn.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
public interface SimpleSession extends EJBObject {
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test1/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test1/ejb/SimpleSessionBean.java
index 1c0f1c6..99f6fcc 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test1/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test1/ejb/SimpleSessionBean.java
@@ -19,7 +19,7 @@
import java.util.*;
import java.io.*;
import java.rmi.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.transaction.UserTransaction;
import javax.naming.*;
import javax.sql.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test1/ejb/SimpleSessionHome.java b/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test1/ejb/SimpleSessionHome.java
index 898ea1a..31953e3 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test1/ejb/SimpleSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test1/ejb/SimpleSessionHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.notxconn.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
public interface SimpleSessionHome extends EJBHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test2/ejb/SimpleSession.java b/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test2/ejb/SimpleSession.java
index db2a3f6..7be912e 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test2/ejb/SimpleSession.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test2/ejb/SimpleSession.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.notxconn.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
public interface SimpleSession extends EJBObject {
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test2/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test2/ejb/SimpleSessionBean.java
index ec81083..0f15ddc 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test2/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test2/ejb/SimpleSessionBean.java
@@ -19,7 +19,7 @@
import java.util.*;
import java.io.*;
import java.rmi.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.transaction.UserTransaction;
import javax.naming.*;
import javax.sql.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test2/ejb/SimpleSessionHome.java b/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test2/ejb/SimpleSessionHome.java
index 898ea1a..31953e3 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test2/ejb/SimpleSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test2/ejb/SimpleSessionHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.notxconn.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
public interface SimpleSessionHome extends EJBHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/notxops/ejb/SimpleSession.java b/appserver/tests/appserv-tests/devtests/jdbc/notxops/ejb/SimpleSession.java
index 647652f..17289cd 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/notxops/ejb/SimpleSession.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/notxops/ejb/SimpleSession.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.notxops.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleSession extends EJBObject {
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/notxops/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/jdbc/notxops/ejb/SimpleSessionBean.java
index 8eab4a4..afbd45b 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/notxops/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/notxops/ejb/SimpleSessionBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.notxops.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.rmi.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/notxops/ejb/SimpleSessionHome.java b/appserver/tests/appserv-tests/devtests/jdbc/notxops/ejb/SimpleSessionHome.java
index 14c9c78..dbf7010 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/notxops/ejb/SimpleSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/notxops/ejb/SimpleSessionHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.notxops.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleSessionHome extends EJBHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnection/ejb/NoTxConnTest.java b/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnection/ejb/NoTxConnTest.java
index b7205a5..ae2ad4c 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnection/ejb/NoTxConnTest.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnection/ejb/NoTxConnTest.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.onlygetconnection.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
import java.util.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnection/ejb/NoTxConnTestBean.java b/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnection/ejb/NoTxConnTestBean.java
index de19db0..46551cb 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnection/ejb/NoTxConnTestBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnection/ejb/NoTxConnTestBean.java
@@ -19,7 +19,7 @@
import java.util.*;
import java.io.*;
import java.rmi.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.transaction.UserTransaction;
import javax.naming.*;
import javax.sql.*;
@@ -28,11 +28,11 @@
public class NoTxConnTestBean implements SessionBean {
private EJBContext ejbcontext;
- private transient javax.ejb.SessionContext m_ctx = null;
+ private transient jakarta.ejb.SessionContext m_ctx = null;
transient javax.sql.DataSource ds;
- public void setSessionContext(javax.ejb.SessionContext ctx) {
+ public void setSessionContext(jakarta.ejb.SessionContext ctx) {
m_ctx = ctx;
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnection/ejb/NoTxConnTestHome.java b/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnection/ejb/NoTxConnTestHome.java
index 5ed2c63..a605352 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnection/ejb/NoTxConnTestHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnection/ejb/NoTxConnTestHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.onlygetconnection.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
import java.util.*;
import java.io.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/pooling/ejb/SimpleSession.java b/appserver/tests/appserv-tests/devtests/jdbc/pooling/ejb/SimpleSession.java
index 07044d5..69219ed 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/pooling/ejb/SimpleSession.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/pooling/ejb/SimpleSession.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.pooling.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
import javax.sql.DataSource;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/pooling/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/jdbc/pooling/ejb/SimpleSessionBean.java
index 3258158..3304046 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/pooling/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/pooling/ejb/SimpleSessionBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.pooling.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.rmi.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/pooling/ejb/SimpleSessionHome.java b/appserver/tests/appserv-tests/devtests/jdbc/pooling/ejb/SimpleSessionHome.java
index b4a486d..5dbf6ac 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/pooling/ejb/SimpleSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/pooling/ejb/SimpleSessionHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.pooling.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleSessionHome extends EJBHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/maxpoolsize/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/maxpoolsize/ejb/SimpleBMP.java
index 320cb68..e2a768d 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/maxpoolsize/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/maxpoolsize/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.reconfig.maxpoolsize.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMP extends EJBObject {
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/maxpoolsize/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/maxpoolsize/ejb/SimpleBMPBean.java
index 1a52b1f..2049315 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/maxpoolsize/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/maxpoolsize/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.reconfig.maxpoolsize.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.rmi.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/maxpoolsize/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/maxpoolsize/ejb/SimpleBMPHome.java
index 17c26a5..ee75523 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/maxpoolsize/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/maxpoolsize/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.reconfig.maxpoolsize.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMPHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth-2/ejb/SimpleSession.java b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth-2/ejb/SimpleSession.java
index 568f93f..a0dea46 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth-2/ejb/SimpleSession.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth-2/ejb/SimpleSession.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.reconfig.poolauth.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleSession extends EJBObject {
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth-2/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth-2/ejb/SimpleSessionBean.java
index 45a937f..67cd654 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth-2/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth-2/ejb/SimpleSessionBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.reconfig.poolauth.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.rmi.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth-2/ejb/SimpleSessionHome.java b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth-2/ejb/SimpleSessionHome.java
index ec3238f..41c570d 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth-2/ejb/SimpleSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth-2/ejb/SimpleSessionHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.reconfig.poolauth.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleSessionHome extends EJBHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth/ejb/SimpleSession.java b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth/ejb/SimpleSession.java
index 568f93f..a0dea46 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth/ejb/SimpleSession.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth/ejb/SimpleSession.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.reconfig.poolauth.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleSession extends EJBObject {
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth/ejb/SimpleSessionBean.java
index f7baa9b..782bdc4 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth/ejb/SimpleSessionBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.reconfig.poolauth.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.rmi.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth/ejb/SimpleSessionHome.java b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth/ejb/SimpleSessionHome.java
index ec3238f..41c570d 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth/ejb/SimpleSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth/ejb/SimpleSessionHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.reconfig.poolauth.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleSessionHome extends EJBHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/userpass/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/userpass/ejb/SimpleBMP.java
index fec79aa..2ddd427 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/userpass/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/userpass/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.reconfig.userpass.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMP
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/userpass/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/userpass/ejb/SimpleBMPBean.java
index a082039..3a64bea 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/userpass/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/userpass/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.reconfig.userpass.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.rmi.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/userpass/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/userpass/ejb/SimpleBMPHome.java
index d478f8e..569c514 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/userpass/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/userpass/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.reconfig.userpass.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMPHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/simple/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/simple/ejb/SimpleBMP.java
index 3500734..0b7bccf 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/simple/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/simple/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.simple.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMP
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/simple/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/simple/ejb/SimpleBMPBean.java
index 1b322e3..0222cd7 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/simple/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/simple/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.simple.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.rmi.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/simple/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/simple/ejb/SimpleBMPHome.java
index a075cb9..634909c 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/simple/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/simple/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.simple.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMPHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/simplemysql/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/simplemysql/ejb/SimpleBMP.java
index bb2a2a0..8bda3bf 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/simplemysql/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/simplemysql/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.simplemysql.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMP
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/simplemysql/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/simplemysql/ejb/SimpleBMPBean.java
index 6b0359b..2556bf7 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/simplemysql/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/simplemysql/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.simplemysql.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.rmi.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/simplemysql/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/simplemysql/ejb/SimpleBMPHome.java
index 265ae56..64e0a45 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/simplemysql/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/simplemysql/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.simplemysql.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMPHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/simpleora/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/simpleora/ejb/SimpleBMP.java
index e300d14..adb9144 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/simpleora/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/simpleora/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.simpleora.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMP
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/simpleora/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/simpleora/ejb/SimpleBMPBean.java
index 72614ec..fd2dd44 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/simpleora/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/simpleora/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.simpleora.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.rmi.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/simpleora/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/simpleora/ejb/SimpleBMPHome.java
index 6aff595..ddb1ce4 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/simpleora/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/simpleora/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.simpleora.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMPHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/simpleoradd/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/simpleoradd/ejb/SimpleBMP.java
index e300d14..adb9144 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/simpleoradd/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/simpleoradd/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.simpleora.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMP
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/simpleoradd/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/simpleoradd/ejb/SimpleBMPBean.java
index 1010b27..f20cc0f 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/simpleoradd/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/simpleoradd/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.simpleora.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.rmi.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/simpleoradd/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/simpleoradd/ejb/SimpleBMPHome.java
index 6aff595..ddb1ce4 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/simpleoradd/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/simpleoradd/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.simpleora.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMPHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/sqltracemonitoring/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/sqltracemonitoring/ejb/SimpleBMP.java
index 5c170ba..6ea9221 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/sqltracemonitoring/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/sqltracemonitoring/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.statementwrapper.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMP extends EJBObject {
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/sqltracemonitoring/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/sqltracemonitoring/ejb/SimpleBMPBean.java
index f575d4a..2d0cf8b 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/sqltracemonitoring/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/sqltracemonitoring/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.statementwrapper.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.sql.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/sqltracemonitoring/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/sqltracemonitoring/ejb/SimpleBMPHome.java
index 90b8139..80ac959 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/sqltracemonitoring/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/sqltracemonitoring/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.statementwrapper.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMPHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/statementleakdetection/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/statementleakdetection/ejb/SimpleBMP.java
index 7919752..cc676be 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/statementleakdetection/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/statementleakdetection/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.statementwrapper.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMP
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/statementleakdetection/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/statementleakdetection/ejb/SimpleBMPBean.java
index 43ce57e..74aa810 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/statementleakdetection/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/statementleakdetection/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.statementwrapper.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.sql.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/statementleakdetection/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/statementleakdetection/ejb/SimpleBMPHome.java
index 90b8139..80ac959 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/statementleakdetection/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/statementleakdetection/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.statementwrapper.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMPHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/statementtimeout/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/statementtimeout/ejb/SimpleBMP.java
index a9eccc3..d49d3f0 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/statementtimeout/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/statementtimeout/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.statementtimeout.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMP
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/statementtimeout/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/statementtimeout/ejb/SimpleBMPBean.java
index 2868be1..7d49f8d 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/statementtimeout/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/statementtimeout/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.statementtimeout.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.sql.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/statementtimeout/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/statementtimeout/ejb/SimpleBMPHome.java
index fd2bf94..b069dd1 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/statementtimeout/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/statementtimeout/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.statementtimeout.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMPHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/statementwrapper/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/statementwrapper/ejb/SimpleBMP.java
index 03bfe7c..5b2448a 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/statementwrapper/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/statementwrapper/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.statementwrapper.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMP
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/statementwrapper/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/statementwrapper/ejb/SimpleBMPBean.java
index 3c2373f..97aead0 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/statementwrapper/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/statementwrapper/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.statementwrapper.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.sql.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/statementwrapper/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/statementwrapper/ejb/SimpleBMPHome.java
index 90b8139..80ac959 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/statementwrapper/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/statementwrapper/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.statementwrapper.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMPHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.fixed/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.fixed/ejb/SimpleBMP.java
index 2022090..42104b5 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.fixed/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.fixed/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.stmtcaching.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMP
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.fixed/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.fixed/ejb/SimpleBMPBean.java
index ddb028a..bcf3676 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.fixed/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.fixed/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.stmtcaching.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import java.sql.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.fixed/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.fixed/ejb/SimpleBMPHome.java
index ce6dd96..44de1ce 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.fixed/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.fixed/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.stmtcaching.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMPHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.monitoring/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.monitoring/ejb/SimpleBMP.java
index 2022090..42104b5 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.monitoring/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.monitoring/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.stmtcaching.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMP
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.monitoring/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.monitoring/ejb/SimpleBMPBean.java
index 94b480e..f81bde8 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.monitoring/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.monitoring/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.stmtcaching.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import java.sql.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.monitoring/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.monitoring/ejb/SimpleBMPHome.java
index ce6dd96..44de1ce 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.monitoring/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.monitoring/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.stmtcaching.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMPHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss/ejb/SimpleBMP.java
index 2022090..42104b5 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.stmtcaching.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMP
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss/ejb/SimpleBMPBean.java
index fbc47c3..49a798f 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.stmtcaching.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import java.sql.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss/ejb/SimpleBMPHome.java
index ce6dd96..44de1ce 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.stmtcaching.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMPHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stress/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/stress/ejb/SimpleBMP.java
index 56f8a21..857909d 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/stress/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stress/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.stress.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMP
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stress/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/stress/ejb/SimpleBMPBean.java
index 991da0e..a8d570c 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/stress/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stress/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.stress.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.rmi.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stress/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/stress/ejb/SimpleBMPHome.java
index 4c60b31..a346b7e 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/stress/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stress/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.stress.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMPHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stress1/descriptor/ejb-jar-roster.xml b/appserver/tests/appserv-tests/devtests/jdbc/stress1/descriptor/ejb-jar-roster.xml
index 17b7716..082b7fe 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/stress1/descriptor/ejb-jar-roster.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stress1/descriptor/ejb-jar-roster.xml
@@ -209,7 +209,7 @@
<method-intf>Home</method-intf>
<method-name>remove</method-name>
<method-params>
- <method-param>javax.ejb.Handle</method-param>
+ <method-param>jakarta.ejb.Handle</method-param>
</method-params>
</method>
<method>
@@ -310,7 +310,7 @@
<method-intf>Remote</method-intf>
<method-name>isIdentical</method-name>
<method-params>
- <method-param>javax.ejb.EJBObject</method-param>
+ <method-param>jakarta.ejb.EJBObject</method-param>
</method-params>
</method>
<method>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stress1/descriptor/ejb-jar-team.xml b/appserver/tests/appserv-tests/devtests/jdbc/stress1/descriptor/ejb-jar-team.xml
index 0bc35a8..72e77ad 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/stress1/descriptor/ejb-jar-team.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stress1/descriptor/ejb-jar-team.xml
@@ -332,7 +332,7 @@
<method-intf>Local</method-intf>
<method-name>isIdentical</method-name>
<method-params>
- <method-param>javax.ejb.EJBLocalObject</method-param>
+ <method-param>jakarta.ejb.EJBLocalObject</method-param>
</method-params>
</method>
<method>
@@ -517,7 +517,7 @@
<method-intf>Local</method-intf>
<method-name>isIdentical</method-name>
<method-params>
- <method-param>javax.ejb.EJBLocalObject</method-param>
+ <method-param>jakarta.ejb.EJBLocalObject</method-param>
</method-params>
</method>
</method-permission>
@@ -612,7 +612,7 @@
<method-intf>Local</method-intf>
<method-name>isIdentical</method-name>
<method-params>
- <method-param>javax.ejb.EJBLocalObject</method-param>
+ <method-param>jakarta.ejb.EJBLocalObject</method-param>
</method-params>
</method>
</method-permission>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LeagueBean.java b/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LeagueBean.java
index 10b1265..4195b64 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LeagueBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LeagueBean.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.jdbc.stress1.ejb;
import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import com.sun.s1asdev.jdbc.stress1.util.Debug;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalLeague.java b/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalLeague.java
index e42b9cd..1b07de6 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalLeague.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalLeague.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.jdbc.stress1.ejb;
import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface LocalLeague extends EJBLocalObject {
public String getLeagueId();
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalLeagueHome.java b/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalLeagueHome.java
index 74c7058..6dc99ca 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalLeagueHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalLeagueHome.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.jdbc.stress1.ejb;
import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface LocalLeagueHome extends EJBLocalHome {
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalPlayer.java b/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalPlayer.java
index 1f98876..c21c7ee 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalPlayer.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalPlayer.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.jdbc.stress1.ejb;
import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface LocalPlayer extends EJBLocalObject {
public String getPlayerId();
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalPlayerHome.java b/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalPlayerHome.java
index 65f015c..2b3ae76 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalPlayerHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalPlayerHome.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.jdbc.stress1.ejb;
import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface LocalPlayerHome extends EJBLocalHome {
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalTeam.java b/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalTeam.java
index 0f96401..229ced4 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalTeam.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalTeam.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.jdbc.stress1.ejb;
import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface LocalTeam extends EJBLocalObject {
public String getTeamId();
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalTeamHome.java b/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalTeamHome.java
index 89e50e1..d0f2fa8 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalTeamHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalTeamHome.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.jdbc.stress1.ejb;
import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
public interface LocalTeamHome extends EJBLocalHome {
public LocalTeam create (String id, String name, String city)
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/PlayerBean.java b/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/PlayerBean.java
index 5997b4e..694bd60 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/PlayerBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/PlayerBean.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.jdbc.stress1.ejb;
import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import com.sun.s1asdev.jdbc.stress1.util.Debug;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/Roster.java b/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/Roster.java
index 071ddec..274047f 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/Roster.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/Roster.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.jdbc.stress1.ejb;
import java.util.*;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
import java.rmi.RemoteException;
import com.sun.s1asdev.jdbc.stress1.util.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/RosterBean.java b/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/RosterBean.java
index e6e5965..592a6b5 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/RosterBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/RosterBean.java
@@ -17,8 +17,8 @@
package com.sun.s1asdev.jdbc.stress1.ejb;
import java.util.*;
-import javax.ejb.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import com.sun.s1asdev.jdbc.stress1.util.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/RosterHome.java b/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/RosterHome.java
index f43614a..3db66e0 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/RosterHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/RosterHome.java
@@ -17,8 +17,8 @@
package com.sun.s1asdev.jdbc.stress1.ejb;
import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBHome;
public interface RosterHome extends EJBHome {
Roster create() throws RemoteException, CreateException;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/TeamBean.java b/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/TeamBean.java
index 2561d86..e4562b3 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/TeamBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/TeamBean.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.jdbc.stress1.ejb;
import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import com.sun.s1asdev.jdbc.stress1.util.Debug;
import com.sun.s1asdev.jdbc.stress1.util.PlayerDetails;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/tracingsql/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/tracingsql/ejb/SimpleBMP.java
index 8f1fa51..a078fcc 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/tracingsql/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/tracingsql/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.tracingsql.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMP
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/tracingsql/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/tracingsql/ejb/SimpleBMPBean.java
index 95b1a71..040881f 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/tracingsql/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/tracingsql/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.tracingsql.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.sql.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/tracingsql/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/tracingsql/ejb/SimpleBMPHome.java
index 0b895e5..20d8d48 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/tracingsql/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/tracingsql/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.tracingsql.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMPHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/ejb/bmsample3.java b/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/ejb/bmsample3.java
index d9c70a2..539a427 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/ejb/bmsample3.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/ejb/bmsample3.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.transactions.test1.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
import java.util.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/ejb/bmsample3home.java b/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/ejb/bmsample3home.java
index 5c4e56f..c8dd319 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/ejb/bmsample3home.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/ejb/bmsample3home.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.transactions.test1.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
import java.util.*;
import java.io.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/ejb/bmsample4.java b/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/ejb/bmsample4.java
index 2821c8b..d25e473 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/ejb/bmsample4.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/ejb/bmsample4.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.transactions.test1.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
import java.util.*;
import java.io.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/ejb/bmsample4home.java b/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/ejb/bmsample4home.java
index 12152f3..31ee623 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/ejb/bmsample4home.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/ejb/bmsample4home.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.transactions.test1.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
import java.util.*;
import java.io.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/ejb/bmsamplebean3.java b/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/ejb/bmsamplebean3.java
index 104fce9..b2d9ed5 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/ejb/bmsamplebean3.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/ejb/bmsamplebean3.java
@@ -19,7 +19,7 @@
import java.util.*;
import java.io.*;
import java.rmi.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.transaction.UserTransaction;
import javax.naming.*;
import javax.sql.*;
@@ -28,9 +28,9 @@
public class bmsamplebean3 implements SessionBean
{
- private transient javax.ejb.SessionContext m_ctx = null;
+ private transient jakarta.ejb.SessionContext m_ctx = null;
EJBContext ejbcontext;
- public void setSessionContext(javax.ejb.SessionContext ctx)
+ public void setSessionContext(jakarta.ejb.SessionContext ctx)
{
m_ctx = ctx;
// m_ctx.setRollbackOnly();
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/ejb/bmsamplebean4.java b/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/ejb/bmsamplebean4.java
index a6e25d1..41c2463 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/ejb/bmsamplebean4.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/ejb/bmsamplebean4.java
@@ -19,7 +19,7 @@
import java.util.*;
import java.io.*;
import java.rmi.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.transaction.UserTransaction;
import javax.naming.*;
import javax.sql.*;
@@ -28,8 +28,8 @@
public class bmsamplebean4 implements SessionBean
{
EJBContext ejbcontext;
- private transient javax.ejb.SessionContext m_ctx = null;
- public void setSessionContext(javax.ejb.SessionContext ctx)
+ private transient jakarta.ejb.SessionContext m_ctx = null;
+ public void setSessionContext(jakarta.ejb.SessionContext ctx)
{
m_ctx = ctx;
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/transactions/test2/ejb/bmsample1.java b/appserver/tests/appserv-tests/devtests/jdbc/transactions/test2/ejb/bmsample1.java
index b94487f..78835ac 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/transactions/test2/ejb/bmsample1.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/transactions/test2/ejb/bmsample1.java
@@ -19,7 +19,7 @@
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
import java.util.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/transactions/test2/ejb/bmsample1home.java b/appserver/tests/appserv-tests/devtests/jdbc/transactions/test2/ejb/bmsample1home.java
index 3fe9fa6..e080ca1 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/transactions/test2/ejb/bmsample1home.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/transactions/test2/ejb/bmsample1home.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.transactions.test2.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
import java.util.*;
import java.io.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/transactions/test2/ejb/bmsamplebean1.java b/appserver/tests/appserv-tests/devtests/jdbc/transactions/test2/ejb/bmsamplebean1.java
index 636e822..1f67dbc 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/transactions/test2/ejb/bmsamplebean1.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/transactions/test2/ejb/bmsamplebean1.java
@@ -19,7 +19,7 @@
import java.util.*;
import java.io.*;
import java.rmi.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.transaction.UserTransaction;
import javax.naming.*;
import javax.sql.*;
@@ -34,7 +34,7 @@
transient ResultSet rs = null,rs2=null;
- public void setSessionContext(javax.ejb.SessionContext ctx)
+ public void setSessionContext(jakarta.ejb.SessionContext ctx)
{
m_ctx = ctx;
}
@@ -169,7 +169,7 @@
return 0;
}
- private transient javax.ejb.SessionContext m_ctx = null;
+ private transient jakarta.ejb.SessionContext m_ctx = null;
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig-resources-xml/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig-resources-xml/ejb/SimpleBMP.java
index 3e0c320..323b77f 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig-resources-xml/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig-resources-xml/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.transparent_pool_reconfig.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMP extends EJBObject {
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig-resources-xml/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig-resources-xml/ejb/SimpleBMPBean.java
index 40fa72c..df09b86 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig-resources-xml/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig-resources-xml/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.transparent_pool_reconfig.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.sql.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig-resources-xml/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig-resources-xml/ejb/SimpleBMPHome.java
index 80db325..600d37d 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig-resources-xml/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig-resources-xml/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.transparent_pool_reconfig.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMPHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig/ejb/SimpleBMP.java
index 3e0c320..323b77f 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.transparent_pool_reconfig.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMP extends EJBObject {
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig/ejb/SimpleBMPBean.java
index 7b09e24..8e8f346 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.transparent_pool_reconfig.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.sql.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig/ejb/SimpleBMPHome.java
index 80db325..600d37d 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.transparent_pool_reconfig.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMPHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txStress/ejb/Enroller.java b/appserver/tests/appserv-tests/devtests/jdbc/txStress/ejb/Enroller.java
index fa5331e..d39cd75 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/txStress/ejb/Enroller.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txStress/ejb/Enroller.java
@@ -16,7 +16,7 @@
package com.sun.s1peqe.ejb.bmp.enroller.ejb;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
import java.rmi.RemoteException;
public interface Enroller extends EJBObject {
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txStress/ejb/EnrollerBean.java b/appserver/tests/appserv-tests/devtests/jdbc/txStress/ejb/EnrollerBean.java
index ad3b8a9..bb72d3e 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/txStress/ejb/EnrollerBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txStress/ejb/EnrollerBean.java
@@ -17,7 +17,7 @@
package com.sun.s1peqe.ejb.bmp.enroller.ejb;
import java.rmi.RemoteException;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.sql.*;
import javax.sql.*;
import javax.transaction.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txStress/ejb/EnrollerHome.java b/appserver/tests/appserv-tests/devtests/jdbc/txStress/ejb/EnrollerHome.java
index 45ce224..2a6b49d 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/txStress/ejb/EnrollerHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txStress/ejb/EnrollerHome.java
@@ -17,8 +17,8 @@
package com.sun.s1peqe.ejb.bmp.enroller.ejb;
import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBHome;
public interface EnrollerHome extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txafternontx/ejb/SimpleSession.java b/appserver/tests/appserv-tests/devtests/jdbc/txafternontx/ejb/SimpleSession.java
index 9b4a40b..6a6edb5 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/txafternontx/ejb/SimpleSession.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txafternontx/ejb/SimpleSession.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.txafternontx.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleSession extends EJBObject {
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txafternontx/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/jdbc/txafternontx/ejb/SimpleSessionBean.java
index bdb60aa..acbd1be 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/txafternontx/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txafternontx/ejb/SimpleSessionBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.txafternontx.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.rmi.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txafternontx/ejb/SimpleSessionHome.java b/appserver/tests/appserv-tests/devtests/jdbc/txafternontx/ejb/SimpleSessionHome.java
index 846d291..1eef98e 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/txafternontx/ejb/SimpleSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txafternontx/ejb/SimpleSessionHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.txafternontx.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleSessionHome extends EJBHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txafternontxjndi/ejb/SimpleSession.java b/appserver/tests/appserv-tests/devtests/jdbc/txafternontxjndi/ejb/SimpleSession.java
index 9b4a40b..6a6edb5 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/txafternontxjndi/ejb/SimpleSession.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txafternontxjndi/ejb/SimpleSession.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.txafternontx.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleSession extends EJBObject {
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txafternontxjndi/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/jdbc/txafternontxjndi/ejb/SimpleSessionBean.java
index d5ff502..c1d7f18 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/txafternontxjndi/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txafternontxjndi/ejb/SimpleSessionBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.txafternontx.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.rmi.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txafternontxjndi/ejb/SimpleSessionHome.java b/appserver/tests/appserv-tests/devtests/jdbc/txafternontxjndi/ejb/SimpleSessionHome.java
index 846d291..1eef98e 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/txafternontxjndi/ejb/SimpleSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txafternontxjndi/ejb/SimpleSessionHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.txafternontx.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleSessionHome extends EJBHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txisolation/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/txisolation/ejb/SimpleBMP.java
index acfab70..6a3dfed 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/txisolation/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txisolation/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.txisolation.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMP extends EJBObject {
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txisolation/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/txisolation/ejb/SimpleBMPBean.java
index fa64be9..6991e2a 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/txisolation/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txisolation/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.txisolation.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.sql.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txisolation/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/txisolation/ejb/SimpleBMPHome.java
index 87e9cf5..cf692ca 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/txisolation/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txisolation/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.txisolation.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMPHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txlevelswitch/ejb/SimpleSession.java b/appserver/tests/appserv-tests/devtests/jdbc/txlevelswitch/ejb/SimpleSession.java
index 94e9aca..144da83 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/txlevelswitch/ejb/SimpleSession.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txlevelswitch/ejb/SimpleSession.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.txlevelswitch.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleSession extends EJBObject {
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txlevelswitch/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/jdbc/txlevelswitch/ejb/SimpleSessionBean.java
index 5f32cee..c42c085 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/txlevelswitch/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txlevelswitch/ejb/SimpleSessionBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.txlevelswitch.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.rmi.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txlevelswitch/ejb/SimpleSessionHome.java b/appserver/tests/appserv-tests/devtests/jdbc/txlevelswitch/ejb/SimpleSessionHome.java
index e1627c0..ad94cf5 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/txlevelswitch/ejb/SimpleSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txlevelswitch/ejb/SimpleSessionHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.txlevelswitch.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleSessionHome extends EJBHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/NoTxConnTest.java b/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/NoTxConnTest.java
index 4d8bd9d..f9951f2 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/NoTxConnTest.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/NoTxConnTest.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.txpassthrough.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
import java.util.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/NoTxConnTestBean.java b/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/NoTxConnTestBean.java
index a59eec0..bc9f8a3 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/NoTxConnTestBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/NoTxConnTestBean.java
@@ -19,7 +19,7 @@
import java.util.*;
import java.io.*;
import java.rmi.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.transaction.UserTransaction;
import javax.naming.*;
import javax.sql.*;
@@ -28,11 +28,11 @@
public class NoTxConnTestBean implements SessionBean {
private EJBContext ejbcontext;
- private transient javax.ejb.SessionContext m_ctx = null;
+ private transient jakarta.ejb.SessionContext m_ctx = null;
transient javax.sql.DataSource ds;
- public void setSessionContext(javax.ejb.SessionContext ctx) {
+ public void setSessionContext(jakarta.ejb.SessionContext ctx) {
m_ctx = ctx;
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/NoTxConnTestHome.java b/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/NoTxConnTestHome.java
index 45101ec..e9a4642 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/NoTxConnTestHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/NoTxConnTestHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.txpassthrough.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
import java.util.*;
import java.io.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/Second.java b/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/Second.java
index 230e572..2591ca8 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/Second.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/Second.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.txpassthrough.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
import java.util.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/SecondBean.java b/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/SecondBean.java
index 5774d53..383e3f2 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/SecondBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/SecondBean.java
@@ -19,7 +19,7 @@
import java.util.*;
import java.io.*;
import java.rmi.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.transaction.UserTransaction;
import javax.naming.*;
import javax.sql.*;
@@ -28,11 +28,11 @@
public class SecondBean implements SessionBean {
private EJBContext ejbcontext;
- private transient javax.ejb.SessionContext m_ctx = null;
+ private transient jakarta.ejb.SessionContext m_ctx = null;
transient javax.sql.DataSource ds;
- public void setSessionContext(javax.ejb.SessionContext ctx) {
+ public void setSessionContext(jakarta.ejb.SessionContext ctx) {
m_ctx = ctx;
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/SecondHome.java b/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/SecondHome.java
index 18399e2..a30abc2 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/SecondHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/SecondHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.txpassthrough.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
import java.util.*;
import java.io.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/Third.java b/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/Third.java
index 8f06cbd..ffbe99d 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/Third.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/Third.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.txpassthrough.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
import java.util.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/ThirdBean.java b/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/ThirdBean.java
index 2779330..6678aee 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/ThirdBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/ThirdBean.java
@@ -19,7 +19,7 @@
import java.util.*;
import java.io.*;
import java.rmi.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.transaction.UserTransaction;
import javax.naming.*;
import javax.sql.*;
@@ -28,11 +28,11 @@
public class ThirdBean implements SessionBean {
private EJBContext ejbcontext;
- private transient javax.ejb.SessionContext m_ctx = null;
+ private transient jakarta.ejb.SessionContext m_ctx = null;
transient javax.sql.DataSource ds;
- public void setSessionContext(javax.ejb.SessionContext ctx) {
+ public void setSessionContext(jakarta.ejb.SessionContext ctx) {
m_ctx = ctx;
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/ThirdHome.java b/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/ThirdHome.java
index 307b95f..78813f0 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/ThirdHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/ThirdHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.txpassthrough.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.RemoteException;
import java.util.*;
import java.io.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/ejb/SimpleBMP.java
index 79974d2..ec3bd89 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.autocommit.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMP
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/ejb/SimpleBMPBean.java
index 4d6fa2b..50f1766 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.autocommit.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.rmi.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/ejb/SimpleBMPHome.java
index f02d309..0ba02f8 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.autocommit.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMPHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/servlet/SimpleServlet.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/servlet/SimpleServlet.java
index d5ad389..05fd9b4 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/servlet/SimpleServlet.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/servlet/SimpleServlet.java
@@ -22,7 +22,7 @@
import javax.servlet.ServletException;
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import javax.ejb.CreateException;
+import jakarta.ejb.CreateException;
import java.io.IOException;
import java.io.PrintWriter;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/conncreationretry/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/conncreationretry/ejb/SimpleBMP.java
index bc8339e..ceb2d95 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/conncreationretry/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/conncreationretry/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.connectioncreationretry.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMP
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/conncreationretry/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/conncreationretry/ejb/SimpleBMPBean.java
index 94fb0c6..cd1d898 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/conncreationretry/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/conncreationretry/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.connectioncreationretry.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.sql.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/conncreationretry/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/conncreationretry/ejb/SimpleBMPHome.java
index b60c412..28d7340 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/conncreationretry/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/conncreationretry/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.connectioncreationretry.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMPHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/conncreationretry/servlet/SimpleServlet.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/conncreationretry/servlet/SimpleServlet.java
index cffa70f..d210d1c 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/conncreationretry/servlet/SimpleServlet.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/conncreationretry/servlet/SimpleServlet.java
@@ -22,7 +22,7 @@
import javax.servlet.ServletException;
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import javax.ejb.CreateException;
+import jakarta.ejb.CreateException;
import java.io.IOException;
import java.io.PrintWriter;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/ejb/SimpleBMP.java
index 5d1690f..241fa57 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.connectionleaktracing.ejb;
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
public interface SimpleBMP extends EJBLocalObject {
public boolean test1();
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/ejb/SimpleBMPBean.java
index 3bd8e60..98a69ed 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.connectionleaktracing.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.sql.*;
@@ -25,7 +25,7 @@
implements SessionBean {
protected DataSource ds;
- private transient javax.ejb.SessionContext m_ctx = null;
+ private transient jakarta.ejb.SessionContext m_ctx = null;
public void setSessionContext(SessionContext context) {
m_ctx = context;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/ejb/SimpleBMPHome.java
index deca6f5..87c4a1e 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/ejb/SimpleBMPHome.java
@@ -16,8 +16,8 @@
package com.sun.s1asdev.jdbc.connectionleaktracing.ejb;
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
public interface SimpleBMPHome
extends EJBLocalHome {
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/servlet/SimpleServlet.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/servlet/SimpleServlet.java
index f0d29ce..46c545c 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/servlet/SimpleServlet.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/servlet/SimpleServlet.java
@@ -22,7 +22,7 @@
import javax.servlet.ServletException;
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import javax.ejb.CreateException;
+import jakarta.ejb.CreateException;
import java.io.IOException;
import java.io.PrintWriter;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/ejb/SimpleBMP.java
index 6bc5947..6d48b99 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.contauth.ejb;
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
import java.rmi.*;
public interface SimpleBMP
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/ejb/SimpleBMPBean.java
index 91da4b5..5ceec41 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.contauth.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.rmi.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/ejb/SimpleBMPHome.java
index e4cf82c..8d4fc22 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/ejb/SimpleBMPHome.java
@@ -16,8 +16,8 @@
package com.sun.s1asdev.jdbc.contauth.ejb;
-import javax.ejb.EJBLocalHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
public interface SimpleBMPHome
extends EJBLocalHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/servlet/SimpleServlet.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/servlet/SimpleServlet.java
index f140896..57e866c 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/servlet/SimpleServlet.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/servlet/SimpleServlet.java
@@ -22,7 +22,7 @@
import javax.servlet.ServletException;
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import javax.ejb.CreateException;
+import jakarta.ejb.CreateException;
import java.io.IOException;
import java.io.PrintWriter;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/maxconnectionusage/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/maxconnectionusage/ejb/SimpleBMP.java
index d389048..0074689 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/maxconnectionusage/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/maxconnectionusage/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.maxconnectionusage.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMP
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/maxconnectionusage/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/maxconnectionusage/ejb/SimpleBMPBean.java
index 1e8ad4e..04da364 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/maxconnectionusage/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/maxconnectionusage/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.maxconnectionusage.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import java.sql.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/maxconnectionusage/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/maxconnectionusage/ejb/SimpleBMPHome.java
index 5aa79a4..e413ca8 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/maxconnectionusage/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/maxconnectionusage/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.maxconnectionusage.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMPHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/maxconnectionusage/servlet/SimpleServlet.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/maxconnectionusage/servlet/SimpleServlet.java
index 4f1773d..1b1700c 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/maxconnectionusage/servlet/SimpleServlet.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/maxconnectionusage/servlet/SimpleServlet.java
@@ -22,7 +22,7 @@
import javax.servlet.ServletException;
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import javax.ejb.CreateException;
+import jakarta.ejb.CreateException;
import java.io.IOException;
import java.io.PrintWriter;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/multipleusercredentials/ejb/SimpleSession.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/multipleusercredentials/ejb/SimpleSession.java
index 9fb5d4a..33f3b4e 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/multipleusercredentials/ejb/SimpleSession.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/multipleusercredentials/ejb/SimpleSession.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.multipleusercredentials.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleSession extends EJBLocalObject {
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/multipleusercredentials/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/multipleusercredentials/ejb/SimpleSessionBean.java
index 7b5d964..4b0c64d 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/multipleusercredentials/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/multipleusercredentials/ejb/SimpleSessionBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.multipleusercredentials.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.sql.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/multipleusercredentials/ejb/SimpleSessionHome.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/multipleusercredentials/ejb/SimpleSessionHome.java
index 9a06ad2..83e8bbe 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/multipleusercredentials/ejb/SimpleSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/multipleusercredentials/ejb/SimpleSessionHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.multipleusercredentials.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleSessionHome extends EJBLocalHome {
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/multipleusercredentials/servlet/SimpleServlet.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/multipleusercredentials/servlet/SimpleServlet.java
index 0daf999..214bea4 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/multipleusercredentials/servlet/SimpleServlet.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/multipleusercredentials/servlet/SimpleServlet.java
@@ -22,7 +22,7 @@
import javax.servlet.ServletException;
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import javax.ejb.CreateException;
+import jakarta.ejb.CreateException;
import java.io.IOException;
import java.io.PrintWriter;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/ejb/SimpleBMP.java
index d8817b5..4626204 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.resenabledisable.ejb;
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
public interface SimpleBMP extends EJBLocalObject {
public boolean test1();
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/ejb/SimpleBMPBean.java
index 9628af4..90a86a1 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.resenabledisable.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.sql.*;
@@ -25,7 +25,7 @@
implements SessionBean {
protected DataSource ds;
- private transient javax.ejb.SessionContext m_ctx = null;
+ private transient jakarta.ejb.SessionContext m_ctx = null;
public void setSessionContext(SessionContext context) {
m_ctx = context;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/ejb/SimpleBMPHome.java
index 268615c..eb9c524 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/ejb/SimpleBMPHome.java
@@ -16,8 +16,8 @@
package com.sun.s1asdev.jdbc.resenabledisable.ejb;
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
public interface SimpleBMPHome
extends EJBLocalHome {
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/servlet/SimpleServlet.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/servlet/SimpleServlet.java
index 9ca9a1a..b5cd08e 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/servlet/SimpleServlet.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/servlet/SimpleServlet.java
@@ -22,7 +22,7 @@
import javax.servlet.ServletException;
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import javax.ejb.CreateException;
+import jakarta.ejb.CreateException;
import java.io.IOException;
import java.io.PrintWriter;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/statementtimeout/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/statementtimeout/ejb/SimpleBMP.java
index 028e5fa..f83caf9 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/statementtimeout/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/statementtimeout/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.statementtimeout.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMP
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/statementtimeout/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/statementtimeout/ejb/SimpleBMPBean.java
index 2868be1..7d49f8d 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/statementtimeout/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/statementtimeout/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.statementtimeout.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.sql.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/statementtimeout/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/statementtimeout/ejb/SimpleBMPHome.java
index 1448531..3750b14 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/statementtimeout/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/statementtimeout/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.statementtimeout.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMPHome
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/statementtimeout/servlet/SimpleServlet.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/statementtimeout/servlet/SimpleServlet.java
index a2748a4..cb47f6c 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/statementtimeout/servlet/SimpleServlet.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/statementtimeout/servlet/SimpleServlet.java
@@ -22,7 +22,7 @@
import javax.servlet.ServletException;
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import javax.ejb.CreateException;
+import jakarta.ejb.CreateException;
import java.io.IOException;
import java.io.PrintWriter;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/validateatmostonceperiod/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/validateatmostonceperiod/ejb/SimpleBMP.java
index 8acc0f4..4292af9 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/validateatmostonceperiod/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/validateatmostonceperiod/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.validateatmostonceperiod.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMP
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/validateatmostonceperiod/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/validateatmostonceperiod/ejb/SimpleBMPBean.java
index 93d9a7c..61bea23 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/validateatmostonceperiod/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/validateatmostonceperiod/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.validateatmostonceperiod.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.sql.*;
import java.sql.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/validateatmostonceperiod/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/validateatmostonceperiod/ejb/SimpleBMPHome.java
index 7800be3..c104b13 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/validateatmostonceperiod/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/validateatmostonceperiod/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.jdbc.validateatmostonceperiod.ejb;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface SimpleBMPHome
diff --git a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB1/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB1/ejb/MySessionBean.java
index 0bbf5d7..dd18b9a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB1/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB1/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB1/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB1/ejb/MySessionBeanRemote.java
index 2c010c8..1574956 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB1/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB1/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.jmsxdeliverycount.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB1/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB1/ejb/NewMessageBean.java
index 8acbf1b..0da9a68 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB1/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB1/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB2/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB2/ejb/MySessionBean.java
index 0bbf5d7..dd18b9a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB2/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB2/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB2/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB2/ejb/MySessionBeanRemote.java
index 2c010c8..1574956 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB2/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB2/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.jmsxdeliverycount.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB2/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB2/ejb/NewMessageBean.java
index 842fcc9..46840bf 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB2/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB2/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB3/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB3/ejb/MySessionBean.java
index 0bbf5d7..dd18b9a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB3/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB3/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB3/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB3/ejb/MySessionBeanRemote.java
index 2c010c8..1574956 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB3/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB3/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.jmsxdeliverycount.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB3/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB3/ejb/NewMessageBean.java
index 8a79cbd..543351e 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB3/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB3/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB4/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB4/ejb/MySessionBean.java
index 0bbf5d7..dd18b9a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB4/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB4/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB4/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB4/ejb/MySessionBeanRemote.java
index 2c010c8..1574956 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB4/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB4/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.jmsxdeliverycount.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB4/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB4/ejb/NewMessageBean.java
index 5e575d8..38980d3 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB4/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB4/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean1/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean1/ejb/MySessionBean.java
index 219de1c..b6a0d70 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean1/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean1/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean1/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean1/ejb/MySessionBeanRemote.java
index fd97854..f1b9e4b 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean1/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean1/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.jmsxdeliverycount.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean2/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean2/ejb/MySessionBean.java
index b84c162..50ca44f 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean2/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean2/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean2/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean2/ejb/MySessionBeanRemote.java
index fd97854..f1b9e4b 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean2/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean2/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.jmsxdeliverycount.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/ejb/MySessionBean.java
index b9bc63c..b21c9bd 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.activationproperties.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/ejb/NewMessageBean.java
index e86b8c1..f553fec 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/ejb/NewMessageBean2.java
index 112a18a..e58da8c 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/ejb/NewMessageBean2.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/ejb/MySessionBean.java
index 431282a..11b9816 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.activationproperties.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/ejb/NewMessageBean.java
index 722d305..c66f2f6 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/ejb/NewMessageBean2.java
index 1f9f2e8..a138753 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/ejb/NewMessageBean2.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/ejb/MySessionBean.java
index b9bc63c..b21c9bd 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.activationproperties.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/ejb/NewMessageBean.java
index 03a4788..64a92af 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/ejb/NewMessageBean2.java
index 7fc9359..391abe2 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/ejb/NewMessageBean2.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/ejb/MySessionBean.java
index 431282a..11b9816 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.activationproperties.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/ejb/NewMessageBean.java
index 3b65805..ed70d1b 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/ejb/NewMessageBean2.java
index c4bf6f7..bb9505d 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/ejb/NewMessageBean2.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/ejb/MySessionBean.java
index 4dfc257..09bde12 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.activationproperties.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/ejb/NewMessageBean.java
index 9d32ad1..d8c28e8 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/ejb/NewMessageBean2.java
index 87da4b7..40dbf02 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/ejb/NewMessageBean2.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/ejb/MySessionBean.java
index 4a21e37..971389a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.activationproperties.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/ejb/NewMessageBean.java
index 8ac3cbf..8013738 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/ejb/NewMessageBean2.java
index 8f0028d..72bb270 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/ejb/NewMessageBean2.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/ejb/MySessionBean.java
index 431282a..11b9816 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.activationproperties.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/ejb/NewMessageBean.java
index c8fc332..65c4c48 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/ejb/NewMessageBean2.java
index 9d3c0a2..8e8c255 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/ejb/NewMessageBean2.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/ejb/MySessionBean.java
index 4a21e37..971389a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.activationproperties.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/ejb/NewMessageBean.java
index 0f94329..1a89053 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/ejb/NewMessageBean2.java
index 021595e..9ae2684 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/ejb/NewMessageBean2.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableNoClientIdWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableNoClientIdWithName/ejb/MySessionBean.java
index b9bc63c..b21c9bd 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableNoClientIdWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableNoClientIdWithName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableNoClientIdWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableNoClientIdWithName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableNoClientIdWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableNoClientIdWithName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.activationproperties.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableNoClientIdWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableNoClientIdWithName/ejb/NewMessageBean.java
index 2292af6..aad4174 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableNoClientIdWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableNoClientIdWithName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableWithName/ejb/MySessionBean.java
index b9bc63c..b21c9bd 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableWithName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableWithName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableWithName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.activationproperties.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableWithName/ejb/NewMessageBean.java
index a20c857..d40359f 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableWithName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithName/ejb/MySessionBean.java
index be5c1cf..c960afa 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.activationproperties.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithName/ejb/NewMessageBean.java
index 671a6bb..80bb9b8 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithoutName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithoutName/ejb/MySessionBean.java
index 431282a..11b9816 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithoutName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithoutName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithoutName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithoutName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithoutName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithoutName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.activationproperties.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithoutName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithoutName/ejb/NewMessageBean.java
index 3abb9ea..b236b38 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithoutName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithoutName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithName/ejb/MySessionBean.java
index b9bc63c..b21c9bd 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.activationproperties.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithName/ejb/NewMessageBean.java
index bc5a7e1..813fa1b 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithoutName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithoutName/ejb/MySessionBean.java
index bfcae12..50db2f6 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithoutName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithoutName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithoutName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.activationproperties.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithoutName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithoutName/ejb/NewMessageBean.java
index bf8c238..e0ac9b0 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithoutName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithoutName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/ejb/MySessionBean.java
index b9bc63c..b21c9bd 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.activationproperties.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/ejb/NewMessageBean.java
index e495e25..6e21123 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/ejb/NewMessageBean2.java
index 4c0bc78..775ef68 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/ejb/NewMessageBean2.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithoutName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithoutName/ejb/MySessionBean.java
index 431282a..11b9816 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithoutName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithoutName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithoutName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithoutName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithoutName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithoutName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.activationproperties.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithoutName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithoutName/ejb/NewMessageBean.java
index 9945ad5..8bc9109 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithoutName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithoutName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithoutName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithoutName/ejb/NewMessageBean2.java
index a8d0b11..9e6d769 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithoutName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithoutName/ejb/NewMessageBean2.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Topic", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/ejb/MySessionBean.java
index b9bc63c..b21c9bd 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.activationproperties.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/ejb/NewMessageBean.java
index 5372658..b466943 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/ejb/NewMessageBean2.java
index 6cad007..9ba7b08 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/ejb/NewMessageBean2.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/ejb/MySessionBean.java
index 431282a..11b9816 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.activationproperties.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/ejb/NewMessageBean.java
index 2afdfd5..198c748 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/ejb/NewMessageBean2.java
index a67a914..3a2f313 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/ejb/NewMessageBean2.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/ejb/MySessionBean.java
index b9bc63c..b21c9bd 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.activationproperties.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/ejb/NewMessageBean.java
index 5656498..7985e1f 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/ejb/NewMessageBean2.java
index cb46c2e..af50fb1 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/ejb/NewMessageBean2.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/ejb/MySessionBean.java
index 431282a..11b9816 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.activationproperties.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/ejb/NewMessageBean.java
index 443b85b..a7a9dbe 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/ejb/NewMessageBean2.java
index c7e7720..df0e0bb 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/ejb/NewMessageBean2.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/ejb/MySessionBean.java
index b9bc63c..b21c9bd 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.activationproperties.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/ejb/NewMessageBean.java
index 9d03bde..5b1c990 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/ejb/NewMessageBean2.java
index 5ec8ddc..2eabe0d 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/ejb/NewMessageBean2.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/ejb/MySessionBean.java
index 431282a..11b9816 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.activationproperties.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/ejb/NewMessageBean.java
index 83567df..3e8f1d3 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/ejb/NewMessageBean2.java
index 5d24980..9baa358 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/ejb/NewMessageBean2.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableNoClientIdWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableNoClientIdWithName/ejb/MySessionBean.java
index b9bc63c..b21c9bd 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableNoClientIdWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableNoClientIdWithName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableNoClientIdWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableNoClientIdWithName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableNoClientIdWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableNoClientIdWithName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.activationproperties.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableNoClientIdWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableNoClientIdWithName/ejb/NewMessageBean.java
index 8806c03..cad5fdf 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableNoClientIdWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableNoClientIdWithName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableWithName/ejb/MySessionBean.java
index b9bc63c..b21c9bd 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableWithName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableWithName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableWithName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.activationproperties.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableWithName/ejb/NewMessageBean.java
index f973621..327a0e9 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableWithName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithName/ejb/MySessionBean.java
index b9bc63c..b21c9bd 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.activationproperties.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithName/ejb/NewMessageBean.java
index 9885aff..e368a51 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithoutName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithoutName/ejb/MySessionBean.java
index bfcae12..50db2f6 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithoutName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithoutName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithoutName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.activationproperties.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithoutName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithoutName/ejb/NewMessageBean.java
index 073bb1e..3e7db94 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithoutName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithoutName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/ejb/MySessionBean.java
index b9bc63c..b21c9bd 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.activationproperties.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/ejb/NewMessageBean.java
index e495e25..6e21123 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/ejb/NewMessageBean2.java
index 4c0bc78..775ef68 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/ejb/NewMessageBean2.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/ejb/MySessionBean.java
index 431282a..11b9816 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.activationproperties.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/ejb/NewMessageBean.java
index 9945ad5..8bc9109 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/ejb/NewMessageBean2.java
index 4c2ca4f..de638e2 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/ejb/NewMessageBean2.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/ejb/MySessionBean.java
index b9bc63c..b21c9bd 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.activationproperties.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/ejb/NewMessageBean.java
index 5372658..b466943 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/ejb/NewMessageBean2.java
index 6cad007..9ba7b08 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/ejb/NewMessageBean2.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithoutName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithoutName/ejb/MySessionBean.java
index 431282a..11b9816 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithoutName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithoutName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithoutName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.activationproperties.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithoutName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithoutName/ejb/NewMessageBean.java
index 649a50f..bf77e60 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithoutName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithoutName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Topic", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithoutName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithoutName/ejb/NewMessageBean2.java
index a67a914..3a2f313 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithoutName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithoutName/ejb/NewMessageBean2.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/ejb/MySessionBean.java
index b9bc63c..b21c9bd 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.activationproperties.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/ejb/NewMessageBean.java
index 5656498..7985e1f 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/ejb/NewMessageBean2.java
index cb46c2e..af50fb1 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/ejb/NewMessageBean2.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/ejb/MySessionBean.java
index 431282a..11b9816 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.activationproperties.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/ejb/NewMessageBean.java
index 443b85b..a7a9dbe 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/ejb/NewMessageBean2.java
index c7e7720..df0e0bb 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/ejb/NewMessageBean2.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/ejb/MySessionBean.java
index b9bc63c..b21c9bd 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.activationproperties.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/ejb/NewMessageBean.java
index 9d03bde..5b1c990 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/ejb/NewMessageBean2.java
index 605b4fa..cae9cb8 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/ejb/NewMessageBean2.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/ejb/MySessionBean.java
index 431282a..11b9816 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.activationproperties.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/ejb/NewMessageBean.java
index 83567df..3e8f1d3 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/ejb/NewMessageBean2.java
index 5d24980..9baa358 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/ejb/NewMessageBean2.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableNoClientIdWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableNoClientIdWithName/ejb/MySessionBean.java
index b9bc63c..b21c9bd 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableNoClientIdWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableNoClientIdWithName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableNoClientIdWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableNoClientIdWithName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableNoClientIdWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableNoClientIdWithName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.activationproperties.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableNoClientIdWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableNoClientIdWithName/ejb/NewMessageBean.java
index 8806c03..cad5fdf 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableNoClientIdWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableNoClientIdWithName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableWithName/ejb/MySessionBean.java
index b9bc63c..b21c9bd 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableWithName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableWithName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableWithName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.activationproperties.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableWithName/ejb/NewMessageBean.java
index f973621..327a0e9 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableWithName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithName/ejb/MySessionBean.java
index b9bc63c..b21c9bd 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.activationproperties.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithName/ejb/NewMessageBean.java
index 9885aff..e368a51 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithoutName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithoutName/ejb/MySessionBean.java
index bfcae12..50db2f6 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithoutName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithoutName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithoutName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.activationproperties.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithoutName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithoutName/ejb/NewMessageBean.java
index 073bb1e..3e7db94 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithoutName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithoutName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/annotation/MDB1/ejb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/annotation/MDB1/ejb/MyMessageBean.java
index 24a70c4..e5ab766 100644
--- a/appserver/tests/appserv-tests/devtests/jms/annotation/MDB1/ejb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/annotation/MDB1/ejb/MyMessageBean.java
@@ -19,9 +19,9 @@
import java.util.logging.Level;
import java.util.logging.Logger;
import jakarta.annotation.Resource;
-import javax.ejb.ActivationConfigProperty;
-import javax.ejb.EJBException;
-import javax.ejb.MessageDriven;
+import jakarta.ejb.ActivationConfigProperty;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.MessageDriven;
import javax.inject.Inject;
import jakarta.jms.ConnectionFactory;
import jakarta.jms.JMSConnectionFactory;
diff --git a/appserver/tests/appserv-tests/devtests/jms/annotation/MDB1/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/annotation/MDB1/ejb/MySessionBean.java
index 3b33cd4..b6175b2 100644
--- a/appserver/tests/appserv-tests/devtests/jms/annotation/MDB1/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/annotation/MDB1/ejb/MySessionBean.java
@@ -18,8 +18,8 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
-import javax.ejb.EJBException;
-import javax.ejb.Stateless;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.Stateless;
import javax.inject.Inject;
import jakarta.jms.Connection;
import jakarta.jms.ConnectionFactory;
diff --git a/appserver/tests/appserv-tests/devtests/jms/annotation/MDB1/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/annotation/MDB1/ejb/MySessionBeanRemote.java
index 218b0f4..7be3c68 100644
--- a/appserver/tests/appserv-tests/devtests/jms/annotation/MDB1/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/annotation/MDB1/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.annotation.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface MySessionBeanRemote {
diff --git a/appserver/tests/appserv-tests/devtests/jms/annotation/MDB2/ejb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/annotation/MDB2/ejb/MyMessageBean.java
index 1a762ee..a013f86 100644
--- a/appserver/tests/appserv-tests/devtests/jms/annotation/MDB2/ejb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/annotation/MDB2/ejb/MyMessageBean.java
@@ -19,9 +19,9 @@
import java.util.logging.Level;
import java.util.logging.Logger;
import jakarta.annotation.Resource;
-import javax.ejb.ActivationConfigProperty;
-import javax.ejb.EJBException;
-import javax.ejb.MessageDriven;
+import jakarta.ejb.ActivationConfigProperty;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.MessageDriven;
import javax.inject.Inject;
import jakarta.jms.Connection;
import jakarta.jms.ConnectionFactory;
diff --git a/appserver/tests/appserv-tests/devtests/jms/annotation/MDB2/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/annotation/MDB2/ejb/MySessionBean.java
index 050419d..abe5c3d 100644
--- a/appserver/tests/appserv-tests/devtests/jms/annotation/MDB2/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/annotation/MDB2/ejb/MySessionBean.java
@@ -18,8 +18,8 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
-import javax.ejb.EJBException;
-import javax.ejb.Stateless;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.Stateless;
import javax.inject.Inject;
import jakarta.jms.Connection;
import jakarta.jms.ConnectionFactory;
diff --git a/appserver/tests/appserv-tests/devtests/jms/annotation/MDB2/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/annotation/MDB2/ejb/MySessionBeanRemote.java
index 5da93ae..7f15f44 100644
--- a/appserver/tests/appserv-tests/devtests/jms/annotation/MDB2/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/annotation/MDB2/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.annotation.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface MySessionBeanRemote {
diff --git a/appserver/tests/appserv-tests/devtests/jms/annotation/MDB3/ejb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/annotation/MDB3/ejb/MyMessageBean.java
index e6919cf..364700f 100644
--- a/appserver/tests/appserv-tests/devtests/jms/annotation/MDB3/ejb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/annotation/MDB3/ejb/MyMessageBean.java
@@ -19,9 +19,9 @@
import java.util.logging.Level;
import java.util.logging.Logger;
import jakarta.annotation.Resource;
-import javax.ejb.ActivationConfigProperty;
-import javax.ejb.EJBException;
-import javax.ejb.MessageDriven;
+import jakarta.ejb.ActivationConfigProperty;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.MessageDriven;
import javax.inject.Inject;
import jakarta.jms.ConnectionFactory;
import jakarta.jms.JMSConnectionFactory;
diff --git a/appserver/tests/appserv-tests/devtests/jms/annotation/MDB3/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/annotation/MDB3/ejb/MySessionBean.java
index 015be15..5f7a6f8 100644
--- a/appserver/tests/appserv-tests/devtests/jms/annotation/MDB3/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/annotation/MDB3/ejb/MySessionBean.java
@@ -18,8 +18,8 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
-import javax.ejb.EJBException;
-import javax.ejb.Stateless;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.Stateless;
import javax.inject.Inject;
import jakarta.jms.Connection;
import jakarta.jms.ConnectionFactory;
diff --git a/appserver/tests/appserv-tests/devtests/jms/annotation/MDB3/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/annotation/MDB3/ejb/MySessionBeanRemote.java
index 5da93ae..7f15f44 100644
--- a/appserver/tests/appserv-tests/devtests/jms/annotation/MDB3/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/annotation/MDB3/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.annotation.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface MySessionBeanRemote {
diff --git a/appserver/tests/appserv-tests/devtests/jms/annotation/sessionBean/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/annotation/sessionBean/ejb/MySessionBean.java
index 0ce3f65..c521898 100644
--- a/appserver/tests/appserv-tests/devtests/jms/annotation/sessionBean/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/annotation/sessionBean/ejb/MySessionBean.java
@@ -17,8 +17,8 @@
package org.glassfish.test.jms.annotation.ejb;
import jakarta.annotation.Resource;
-import javax.ejb.EJBException;
-import javax.ejb.Stateless;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.Stateless;
import jakarta.jms.Connection;
import jakarta.jms.ConnectionFactory;
import jakarta.jms.JMSConnectionFactoryDefinition;
diff --git a/appserver/tests/appserv-tests/devtests/jms/annotation/sessionBean/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/annotation/sessionBean/ejb/MySessionBeanRemote.java
index 5da93ae..7f15f44 100644
--- a/appserver/tests/appserv-tests/devtests/jms/annotation/sessionBean/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/annotation/sessionBean/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.annotation.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface MySessionBeanRemote {
diff --git a/appserver/tests/appserv-tests/devtests/jms/defaultCF/ejb/SessionBeanDefault.java b/appserver/tests/appserv-tests/devtests/jms/defaultCF/ejb/SessionBeanDefault.java
index 3068c91..ecd76da 100644
--- a/appserver/tests/appserv-tests/devtests/jms/defaultCF/ejb/SessionBeanDefault.java
+++ b/appserver/tests/appserv-tests/devtests/jms/defaultCF/ejb/SessionBeanDefault.java
@@ -17,7 +17,7 @@
package org.glassfish.test.jms.defaultcf.ejb;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.jms.*;
import javax.naming.InitialContext;
diff --git a/appserver/tests/appserv-tests/devtests/jms/defaultCF/ejb/SessionBeanDefaultRemote.java b/appserver/tests/appserv-tests/devtests/jms/defaultCF/ejb/SessionBeanDefaultRemote.java
index 6ebf2eb..e0af5bd 100644
--- a/appserver/tests/appserv-tests/devtests/jms/defaultCF/ejb/SessionBeanDefaultRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/defaultCF/ejb/SessionBeanDefaultRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.defaultcf.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorRequestScoped/ejb/InterceptorInjection.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorRequestScoped/ejb/InterceptorInjection.java
index c9d1188..5eda27a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorRequestScoped/ejb/InterceptorInjection.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorRequestScoped/ejb/InterceptorInjection.java
@@ -19,7 +19,7 @@
import jakarta.annotation.Resource;
import javax.inject.Inject;
import javax.interceptor.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorRequestScoped/ejb/InterceptorInjectionRemote.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorRequestScoped/ejb/InterceptorInjectionRemote.java
index c9c3134..f91ce7e 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorRequestScoped/ejb/InterceptorInjectionRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorRequestScoped/ejb/InterceptorInjectionRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.injection.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorRequestScoped/ejb/MyInterceptor.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorRequestScoped/ejb/MyInterceptor.java
index a04ac83..e9124d4 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorRequestScoped/ejb/MyInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorRequestScoped/ejb/MyInterceptor.java
@@ -21,7 +21,7 @@
import javax.interceptor.AroundInvoke;
import javax.interceptor.InvocationContext;
import jakarta.jms.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
public class MyInterceptor {
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorTransactionScoped/ejb/InterceptorInjection.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorTransactionScoped/ejb/InterceptorInjection.java
index 4a9262b..85bac6d 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorTransactionScoped/ejb/InterceptorInjection.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorTransactionScoped/ejb/InterceptorInjection.java
@@ -19,7 +19,7 @@
import jakarta.annotation.Resource;
import javax.inject.Inject;
import javax.interceptor.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorTransactionScoped/ejb/InterceptorInjectionRemote.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorTransactionScoped/ejb/InterceptorInjectionRemote.java
index c9c3134..f91ce7e 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorTransactionScoped/ejb/InterceptorInjectionRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorTransactionScoped/ejb/InterceptorInjectionRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.injection.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorTransactionScoped/ejb/MyInterceptor.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorTransactionScoped/ejb/MyInterceptor.java
index f2d1bf5..aaa69cf 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorTransactionScoped/ejb/MyInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorTransactionScoped/ejb/MyInterceptor.java
@@ -20,7 +20,7 @@
import javax.interceptor.AroundInvoke;
import javax.interceptor.InvocationContext;
import jakarta.jms.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
public class MyInterceptor {
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfRequestScoped/ejb/MessageReceiverBean.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfRequestScoped/ejb/MessageReceiverBean.java
index 894408f..eda2327 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfRequestScoped/ejb/MessageReceiverBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfRequestScoped/ejb/MessageReceiverBean.java
@@ -17,7 +17,7 @@
package org.glassfish.test.jms.injection.ejb;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfRequestScoped/ejb/MessageReceiverRemote.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfRequestScoped/ejb/MessageReceiverRemote.java
index f394e40..2230213 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfRequestScoped/ejb/MessageReceiverRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfRequestScoped/ejb/MessageReceiverRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.injection.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfTransactionScoped/ejb/MessageReceiverBean.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfTransactionScoped/ejb/MessageReceiverBean.java
index 894408f..eda2327 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfTransactionScoped/ejb/MessageReceiverBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfTransactionScoped/ejb/MessageReceiverBean.java
@@ -17,7 +17,7 @@
package org.glassfish.test.jms.injection.ejb;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfTransactionScoped/ejb/MessageReceiverRemote.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfTransactionScoped/ejb/MessageReceiverRemote.java
index f394e40..2230213 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfTransactionScoped/ejb/MessageReceiverRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfTransactionScoped/ejb/MessageReceiverRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.injection.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfTransactionScoped/servlet/com/oracle/jms/test/NewJSFManagedBean.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfTransactionScoped/servlet/com/oracle/jms/test/NewJSFManagedBean.java
index ffc0d38..a3a7515 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfTransactionScoped/servlet/com/oracle/jms/test/NewJSFManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfTransactionScoped/servlet/com/oracle/jms/test/NewJSFManagedBean.java
@@ -25,7 +25,7 @@
import jakarta.faces.bean.ViewScoped;
import javax.inject.Inject;
import jakarta.jms.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.transaction.UserTransaction;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspRequestScoped/ejb/MessageReceiverBean.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspRequestScoped/ejb/MessageReceiverBean.java
index 894408f..eda2327 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspRequestScoped/ejb/MessageReceiverBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspRequestScoped/ejb/MessageReceiverBean.java
@@ -17,7 +17,7 @@
package org.glassfish.test.jms.injection.ejb;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspRequestScoped/ejb/MessageReceiverRemote.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspRequestScoped/ejb/MessageReceiverRemote.java
index f394e40..2230213 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspRequestScoped/ejb/MessageReceiverRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspRequestScoped/ejb/MessageReceiverRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.injection.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspTransactionScoped/ejb/MessageReceiverBean.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspTransactionScoped/ejb/MessageReceiverBean.java
index 894408f..eda2327 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspTransactionScoped/ejb/MessageReceiverBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspTransactionScoped/ejb/MessageReceiverBean.java
@@ -17,7 +17,7 @@
package org.glassfish.test.jms.injection.ejb;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspTransactionScoped/ejb/MessageReceiverRemote.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspTransactionScoped/ejb/MessageReceiverRemote.java
index f394e40..2230213 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspTransactionScoped/ejb/MessageReceiverRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspTransactionScoped/ejb/MessageReceiverRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.injection.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletRequestScoped/ejb/MessageReceiverBean.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletRequestScoped/ejb/MessageReceiverBean.java
index 8624092..67f6d41 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletRequestScoped/ejb/MessageReceiverBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletRequestScoped/ejb/MessageReceiverBean.java
@@ -17,7 +17,7 @@
package org.glassfish.test.jms.injection.ejb;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletRequestScoped/ejb/MessageReceiverRemote.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletRequestScoped/ejb/MessageReceiverRemote.java
index 64f8dec..37722f5 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletRequestScoped/ejb/MessageReceiverRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletRequestScoped/ejb/MessageReceiverRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.injection.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletTransactionScoped/ejb/MessageReceiverBean.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletTransactionScoped/ejb/MessageReceiverBean.java
index 8624092..67f6d41 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletTransactionScoped/ejb/MessageReceiverBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletTransactionScoped/ejb/MessageReceiverBean.java
@@ -17,7 +17,7 @@
package org.glassfish.test.jms.injection.ejb;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletTransactionScoped/ejb/MessageReceiverRemote.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletTransactionScoped/ejb/MessageReceiverRemote.java
index 64f8dec..37722f5 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletTransactionScoped/ejb/MessageReceiverRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletTransactionScoped/ejb/MessageReceiverRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.injection.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanRequestScoped/ejb/SessionBeanInjection.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanRequestScoped/ejb/SessionBeanInjection.java
index e8d62b7..4c6d5c4 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanRequestScoped/ejb/SessionBeanInjection.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanRequestScoped/ejb/SessionBeanInjection.java
@@ -17,7 +17,7 @@
package org.glassfish.test.jms.injection.ejb;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanRequestScoped/ejb/SessionBeanInjectionRemote.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanRequestScoped/ejb/SessionBeanInjectionRemote.java
index 92ff9b9..d7ef45b 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanRequestScoped/ejb/SessionBeanInjectionRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanRequestScoped/ejb/SessionBeanInjectionRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.injection.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanTransactionScoped/ejb/SessionBeanInjection.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanTransactionScoped/ejb/SessionBeanInjection.java
index aaa0e4c..4d86405 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanTransactionScoped/ejb/SessionBeanInjection.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanTransactionScoped/ejb/SessionBeanInjection.java
@@ -17,7 +17,7 @@
package org.glassfish.test.jms.injection.ejb;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanTransactionScoped/ejb/SessionBeanInjectionRemote.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanTransactionScoped/ejb/SessionBeanInjectionRemote.java
index 92ff9b9..d7ef45b 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanTransactionScoped/ejb/SessionBeanInjectionRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanTransactionScoped/ejb/SessionBeanInjectionRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.injection.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsRequestScoped/ejb/MessageReceiverBean.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsRequestScoped/ejb/MessageReceiverBean.java
index 894408f..eda2327 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsRequestScoped/ejb/MessageReceiverBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsRequestScoped/ejb/MessageReceiverBean.java
@@ -17,7 +17,7 @@
package org.glassfish.test.jms.injection.ejb;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsRequestScoped/ejb/MessageReceiverRemote.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsRequestScoped/ejb/MessageReceiverRemote.java
index f394e40..2230213 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsRequestScoped/ejb/MessageReceiverRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsRequestScoped/ejb/MessageReceiverRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.injection.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsTransactionScoped/ejb/MessageReceiverBean.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsTransactionScoped/ejb/MessageReceiverBean.java
index 894408f..eda2327 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsTransactionScoped/ejb/MessageReceiverBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsTransactionScoped/ejb/MessageReceiverBean.java
@@ -17,7 +17,7 @@
package org.glassfish.test.jms.injection.ejb;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsTransactionScoped/ejb/MessageReceiverRemote.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsTransactionScoped/ejb/MessageReceiverRemote.java
index f394e40..2230213 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsTransactionScoped/ejb/MessageReceiverRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsTransactionScoped/ejb/MessageReceiverRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.injection.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextDefaultInjection/ejb/SessionBeanInjection1.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextDefaultInjection/ejb/SessionBeanInjection1.java
index 3882edf..b3aa22f 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextDefaultInjection/ejb/SessionBeanInjection1.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextDefaultInjection/ejb/SessionBeanInjection1.java
@@ -17,7 +17,7 @@
package org.glassfish.test.jms.injection.ejb;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
import java.lang.String;
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextDefaultInjection/ejb/SessionBeanInjection2.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextDefaultInjection/ejb/SessionBeanInjection2.java
index 90fe77d..5dbc33b 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextDefaultInjection/ejb/SessionBeanInjection2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextDefaultInjection/ejb/SessionBeanInjection2.java
@@ -17,7 +17,7 @@
package org.glassfish.test.jms.injection.ejb;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextDefaultInjection/ejb/SessionBeanInjectionRemote1.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextDefaultInjection/ejb/SessionBeanInjectionRemote1.java
index 1efe2aa..1cb4a4c 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextDefaultInjection/ejb/SessionBeanInjectionRemote1.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextDefaultInjection/ejb/SessionBeanInjectionRemote1.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.injection.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextDefaultInjection/ejb/SessionBeanInjectionRemote2.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextDefaultInjection/ejb/SessionBeanInjectionRemote2.java
index 4b31ef8..7da2d62 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextDefaultInjection/ejb/SessionBeanInjectionRemote2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextDefaultInjection/ejb/SessionBeanInjectionRemote2.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.injection.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionA/ejb/SessionBeanInjection.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionA/ejb/SessionBeanInjection.java
index bdd9730..4904663 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionA/ejb/SessionBeanInjection.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionA/ejb/SessionBeanInjection.java
@@ -17,7 +17,7 @@
package org.glassfish.test.jms.injection.ejb;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionA/ejb/SessionBeanInjectionRemote.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionA/ejb/SessionBeanInjectionRemote.java
index 468549e..285de4c 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionA/ejb/SessionBeanInjectionRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionA/ejb/SessionBeanInjectionRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.injection.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionB/ejb/SessionBeanInjection1.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionB/ejb/SessionBeanInjection1.java
index ebaaa64..efcfaad 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionB/ejb/SessionBeanInjection1.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionB/ejb/SessionBeanInjection1.java
@@ -17,7 +17,7 @@
package org.glassfish.test.jms.injection.ejb;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
import org.glassfish.test.jms.injection.ejb.SessionBeanInjection2;
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionB/ejb/SessionBeanInjection2.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionB/ejb/SessionBeanInjection2.java
index 4683c1c..c2ea79c 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionB/ejb/SessionBeanInjection2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionB/ejb/SessionBeanInjection2.java
@@ -17,7 +17,7 @@
package org.glassfish.test.jms.injection.ejb;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionB/ejb/SessionBeanInjectionRemote1.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionB/ejb/SessionBeanInjectionRemote1.java
index 2ff7151..affd7f2 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionB/ejb/SessionBeanInjectionRemote1.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionB/ejb/SessionBeanInjectionRemote1.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.injection.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionB/ejb/SessionBeanInjectionRemote2.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionB/ejb/SessionBeanInjectionRemote2.java
index a2673e0..02dc134 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionB/ejb/SessionBeanInjectionRemote2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionB/ejb/SessionBeanInjectionRemote2.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.injection.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionC/ejb/SessionBeanInjection1.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionC/ejb/SessionBeanInjection1.java
index 9e7d7ba..f2f968c 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionC/ejb/SessionBeanInjection1.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionC/ejb/SessionBeanInjection1.java
@@ -17,7 +17,7 @@
package org.glassfish.test.jms.injection.ejb;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
import java.lang.String;
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionC/ejb/SessionBeanInjection2.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionC/ejb/SessionBeanInjection2.java
index 801d461..2bfa214 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionC/ejb/SessionBeanInjection2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionC/ejb/SessionBeanInjection2.java
@@ -17,7 +17,7 @@
package org.glassfish.test.jms.injection.ejb;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionC/ejb/SessionBeanInjectionRemote1.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionC/ejb/SessionBeanInjectionRemote1.java
index 2ff7151..affd7f2 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionC/ejb/SessionBeanInjectionRemote1.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionC/ejb/SessionBeanInjectionRemote1.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.injection.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionC/ejb/SessionBeanInjectionRemote2.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionC/ejb/SessionBeanInjectionRemote2.java
index 4b31ef8..7da2d62 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionC/ejb/SessionBeanInjectionRemote2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionC/ejb/SessionBeanInjectionRemote2.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.injection.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionD/ejb/SessionBeanInjection.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionD/ejb/SessionBeanInjection.java
index a10f02e..6c72089 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionD/ejb/SessionBeanInjection.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionD/ejb/SessionBeanInjection.java
@@ -17,7 +17,7 @@
package org.glassfish.test.jms.injection.ejb;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionD/ejb/SessionBeanInjectionRemote.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionD/ejb/SessionBeanInjectionRemote.java
index a7acdf7..accf635 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionD/ejb/SessionBeanInjectionRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionD/ejb/SessionBeanInjectionRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.injection.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionE/ejb/SessionBeanInjection.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionE/ejb/SessionBeanInjection.java
index ebc81b3..66f2fe7 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionE/ejb/SessionBeanInjection.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionE/ejb/SessionBeanInjection.java
@@ -17,7 +17,7 @@
package org.glassfish.test.jms.injection.ejb;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionE/ejb/SessionBeanInjectionRemote.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionE/ejb/SessionBeanInjectionRemote.java
index 28c3866..0805e9d 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionE/ejb/SessionBeanInjectionRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionE/ejb/SessionBeanInjectionRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.injection.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionF/ejb/SessionBeanInjection1.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionF/ejb/SessionBeanInjection1.java
index b038c72..b36f345 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionF/ejb/SessionBeanInjection1.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionF/ejb/SessionBeanInjection1.java
@@ -17,7 +17,7 @@
package org.glassfish.test.jms.injection.ejb;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionF/ejb/SessionBeanInjection2.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionF/ejb/SessionBeanInjection2.java
index 5522985..09a8562 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionF/ejb/SessionBeanInjection2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionF/ejb/SessionBeanInjection2.java
@@ -17,7 +17,7 @@
package org.glassfish.test.jms.injection.ejb;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionF/ejb/SessionBeanInjectionRemote1.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionF/ejb/SessionBeanInjectionRemote1.java
index 2ff7151..affd7f2 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionF/ejb/SessionBeanInjectionRemote1.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionF/ejb/SessionBeanInjectionRemote1.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.injection.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionF/ejb/SessionBeanInjectionRemote2.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionF/ejb/SessionBeanInjectionRemote2.java
index 4b31ef8..7da2d62 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionF/ejb/SessionBeanInjectionRemote2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionF/ejb/SessionBeanInjectionRemote2.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.injection.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionG/ejb/SessionBeanInjection.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionG/ejb/SessionBeanInjection.java
index 90d2f35..851398b 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionG/ejb/SessionBeanInjection.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionG/ejb/SessionBeanInjection.java
@@ -17,7 +17,7 @@
package org.glassfish.test.jms.injection.ejb;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
import javax.transaction.UserTransaction;
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionG/ejb/SessionBeanInjectionRemote.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionG/ejb/SessionBeanInjectionRemote.java
index 7774c3b..5eb887e 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionG/ejb/SessionBeanInjectionRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionG/ejb/SessionBeanInjectionRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.injection.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionH/ejb/SessionBeanInjection.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionH/ejb/SessionBeanInjection.java
index 0ca0de8..26d79e6 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionH/ejb/SessionBeanInjection.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionH/ejb/SessionBeanInjection.java
@@ -17,7 +17,7 @@
package org.glassfish.test.jms.injection.ejb;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
import javax.transaction.UserTransaction;
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionH/ejb/SessionBeanInjectionRemote.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionH/ejb/SessionBeanInjectionRemote.java
index a41f696..d2f384e 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionH/ejb/SessionBeanInjectionRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionH/ejb/SessionBeanInjectionRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.injection.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionJ/ejb/SessionBeanInjection1.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionJ/ejb/SessionBeanInjection1.java
index 8f45bd1..293b99a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionJ/ejb/SessionBeanInjection1.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionJ/ejb/SessionBeanInjection1.java
@@ -17,7 +17,7 @@
package org.glassfish.test.jms.injection.ejb;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
import org.glassfish.test.jms.injection.ejb.SessionBeanInjection2;
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionJ/ejb/SessionBeanInjection2.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionJ/ejb/SessionBeanInjection2.java
index 4bedb92..d0e0362 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionJ/ejb/SessionBeanInjection2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionJ/ejb/SessionBeanInjection2.java
@@ -17,7 +17,7 @@
package org.glassfish.test.jms.injection.ejb;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionJ/ejb/SessionBeanInjectionRemote1.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionJ/ejb/SessionBeanInjectionRemote1.java
index 2ff7151..affd7f2 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionJ/ejb/SessionBeanInjectionRemote1.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionJ/ejb/SessionBeanInjectionRemote1.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.injection.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionJ/ejb/SessionBeanInjectionRemote2.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionJ/ejb/SessionBeanInjectionRemote2.java
index df9873b..3de6e9f 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionJ/ejb/SessionBeanInjectionRemote2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionJ/ejb/SessionBeanInjectionRemote2.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.injection.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionK/ejb/SessionBeanInjection1.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionK/ejb/SessionBeanInjection1.java
index 7c06e06..31ad25a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionK/ejb/SessionBeanInjection1.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionK/ejb/SessionBeanInjection1.java
@@ -17,7 +17,7 @@
package org.glassfish.test.jms.injection.ejb;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
import org.glassfish.test.jms.injection.ejb.SessionBeanInjection2;
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionK/ejb/SessionBeanInjection2.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionK/ejb/SessionBeanInjection2.java
index 334fe22..c08d15b 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionK/ejb/SessionBeanInjection2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionK/ejb/SessionBeanInjection2.java
@@ -17,7 +17,7 @@
package org.glassfish.test.jms.injection.ejb;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionK/ejb/SessionBeanInjectionRemote1.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionK/ejb/SessionBeanInjectionRemote1.java
index 1efe2aa..1cb4a4c 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionK/ejb/SessionBeanInjectionRemote1.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionK/ejb/SessionBeanInjectionRemote1.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.injection.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionK/ejb/SessionBeanInjectionRemote2.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionK/ejb/SessionBeanInjectionRemote2.java
index 4b31ef8..7da2d62 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionK/ejb/SessionBeanInjectionRemote2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionK/ejb/SessionBeanInjectionRemote2.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.injection.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/MySessionBean.java
index a6c1f3e..062127e 100644
--- a/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/MySessionBean.java
@@ -17,7 +17,7 @@
package org.glassfish.test.jms.mdbdest.ejb;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/MySessionBeanRemote.java
index 1a3967d..bc8af24 100644
--- a/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.mdbdest.ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean.java
index 8d8b067..65b87ed 100644
--- a/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean1.java b/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean1.java
index 586f309..4daf381 100644
--- a/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean1.java
+++ b/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean1.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean2.java
index 725f21e..218783a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean2.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean3.java b/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean3.java
index c5bbfa6..5a4a738 100644
--- a/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean3.java
+++ b/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean3.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean4.java b/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean4.java
index 01c71d9..8e44de2 100644
--- a/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean4.java
+++ b/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean4.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean5.java b/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean5.java
index db11e96..e9a5cf8 100644
--- a/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean5.java
+++ b/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean5.java
@@ -18,7 +18,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.inject.Inject;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/msgdest/jmsweb/ejb/MessageBean.java b/appserver/tests/appserv-tests/devtests/jms/msgdest/jmsweb/ejb/MessageBean.java
index 25b74b9..a2473be 100644
--- a/appserver/tests/appserv-tests/devtests/jms/msgdest/jmsweb/ejb/MessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/msgdest/jmsweb/ejb/MessageBean.java
@@ -18,7 +18,7 @@
import java.rmi.RemoteException;
import jakarta.jms.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.io.Serializable;
import javax.naming.*;
diff --git a/appserver/tests/appserv-tests/devtests/naming/injection/client/Client.java b/appserver/tests/appserv-tests/devtests/naming/injection/client/Client.java
index 941e139..d6767f8 100644
--- a/appserver/tests/appserv-tests/devtests/naming/injection/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/naming/injection/client/Client.java
@@ -16,7 +16,7 @@
package test;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import javax.naming.*;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
diff --git a/appserver/tests/appserv-tests/devtests/naming/injection/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/naming/injection/ejb/Hello.java
index 6730967..7604e9d 100644
--- a/appserver/tests/appserv-tests/devtests/naming/injection/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/naming/injection/ejb/Hello.java
@@ -16,7 +16,7 @@
package test;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface Hello {
diff --git a/appserver/tests/appserv-tests/devtests/naming/injection/ejb/HelloBean.java b/appserver/tests/appserv-tests/devtests/naming/injection/ejb/HelloBean.java
index ffbec54..a78df94 100644
--- a/appserver/tests/appserv-tests/devtests/naming/injection/ejb/HelloBean.java
+++ b/appserver/tests/appserv-tests/devtests/naming/injection/ejb/HelloBean.java
@@ -16,7 +16,7 @@
package test;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.annotation.*;
import java.net.*;
import java.util.*;
diff --git a/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/ejb/Student.java b/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/ejb/Student.java
index d752fe5..97de523 100755
--- a/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/ejb/Student.java
+++ b/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/ejb/Student.java
@@ -17,7 +17,7 @@
package com.sun.s1peqe.ejb.bmp.enroller.ejb;
import java.util.ArrayList;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
import java.rmi.RemoteException;
diff --git a/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/ejb/StudentBean.java b/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/ejb/StudentBean.java
index 3647c2a..8023bb6 100755
--- a/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/ejb/StudentBean.java
+++ b/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/ejb/StudentBean.java
@@ -19,7 +19,7 @@
import java.sql.*;
import javax.sql.*;
import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.rmi.PortableRemoteObject;
diff --git a/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/ejb/StudentHome.java b/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/ejb/StudentHome.java
index c9897b5..2ae3de5 100755
--- a/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/ejb/StudentHome.java
+++ b/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/ejb/StudentHome.java
@@ -16,10 +16,10 @@
package com.sun.s1peqe.ejb.bmp.enroller.ejb;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.FinderException;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.FinderException;
public interface StudentHome extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/Course.java b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/Course.java
index 8c8d171..d2a4674 100755
--- a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/Course.java
+++ b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/Course.java
@@ -17,7 +17,7 @@
package com.sun.s1peqe.ejb.bmp.enroller.ejb;
import java.util.ArrayList;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
import java.rmi.RemoteException;
diff --git a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/CourseBean.java b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/CourseBean.java
index 1474049..c0ff8c4 100755
--- a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/CourseBean.java
+++ b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/CourseBean.java
@@ -19,7 +19,7 @@
import java.sql.*;
import javax.sql.*;
import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.rmi.PortableRemoteObject;
diff --git a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/CourseHome.java b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/CourseHome.java
index 11b68d5..a969a3b 100755
--- a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/CourseHome.java
+++ b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/CourseHome.java
@@ -16,10 +16,10 @@
package com.sun.s1peqe.ejb.bmp.enroller.ejb;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
import java.rmi.RemoteException;
-import javax.ejb.FinderException;
-import javax.ejb.CreateException;
+import jakarta.ejb.FinderException;
+import jakarta.ejb.CreateException;
public interface CourseHome extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/Enroller.java b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/Enroller.java
index 3d3aec8..1ed88fd 100755
--- a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/Enroller.java
+++ b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/Enroller.java
@@ -17,7 +17,7 @@
package com.sun.s1peqe.ejb.bmp.enroller.ejb;
import java.util.ArrayList;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
import java.rmi.RemoteException;
public interface Enroller extends EJBObject {
diff --git a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/EnrollerBean.java b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/EnrollerBean.java
index 053d361..ce9877f 100755
--- a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/EnrollerBean.java
+++ b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/EnrollerBean.java
@@ -17,7 +17,7 @@
package com.sun.s1peqe.ejb.bmp.enroller.ejb;
import java.rmi.RemoteException;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.sql.*;
import javax.sql.*;
import java.util.*;
diff --git a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/EnrollerHome.java b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/EnrollerHome.java
index 45ce224..2a6b49d 100755
--- a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/EnrollerHome.java
+++ b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/EnrollerHome.java
@@ -17,8 +17,8 @@
package com.sun.s1peqe.ejb.bmp.enroller.ejb;
import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBHome;
public interface EnrollerHome extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/Student.java b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/Student.java
index 890c3de..6a8bd29 100755
--- a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/Student.java
+++ b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/Student.java
@@ -17,7 +17,7 @@
package com.sun.s1peqe.ejb.bmp.enroller.ejb;
import java.util.ArrayList;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
import java.rmi.RemoteException;
diff --git a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/StudentBean.java b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/StudentBean.java
index 3447daf..04d951e 100755
--- a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/StudentBean.java
+++ b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/StudentBean.java
@@ -19,7 +19,7 @@
import java.sql.*;
import javax.sql.*;
import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import javax.rmi.PortableRemoteObject;
diff --git a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/StudentHome.java b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/StudentHome.java
index c9897b5..2ae3de5 100755
--- a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/StudentHome.java
+++ b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/StudentHome.java
@@ -16,10 +16,10 @@
package com.sun.s1peqe.ejb.bmp.enroller.ejb;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.FinderException;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.FinderException;
public interface StudentHome extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/naming/naming2/context/pom.xml b/appserver/tests/appserv-tests/devtests/naming/naming2/context/pom.xml
index 8ee07d4..dd120e6 100644
--- a/appserver/tests/appserv-tests/devtests/naming/naming2/context/pom.xml
+++ b/appserver/tests/appserv-tests/devtests/naming/naming2/context/pom.xml
@@ -38,7 +38,7 @@
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
- <artifactId>javax.ejb</artifactId>
+ <artifactId>jakarta.ejb</artifactId>
<version>3.1.1</version>
<scope>compile</scope>
</dependency>
diff --git a/appserver/tests/appserv-tests/devtests/naming/naming2/context/src/main/java/test/TestBean.java b/appserver/tests/appserv-tests/devtests/naming/naming2/context/src/main/java/test/TestBean.java
index 825d466..c3df817 100644
--- a/appserver/tests/appserv-tests/devtests/naming/naming2/context/src/main/java/test/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/naming/naming2/context/src/main/java/test/TestBean.java
@@ -17,7 +17,7 @@
package test;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
import java.util.Properties;
diff --git a/appserver/tests/appserv-tests/devtests/naming/naming2/context/src/test/java/test/ContextTest.java b/appserver/tests/appserv-tests/devtests/naming/naming2/context/src/test/java/test/ContextTest.java
index f9c3159..4c855e2 100644
--- a/appserver/tests/appserv-tests/devtests/naming/naming2/context/src/test/java/test/ContextTest.java
+++ b/appserver/tests/appserv-tests/devtests/naming/naming2/context/src/test/java/test/ContextTest.java
@@ -26,7 +26,7 @@
import org.junit.rules.TestName;
import org.junit.rules.TestWatcher;
-import javax.ejb.embeddable.EJBContainer;
+import jakarta.ejb.embeddable.EJBContainer;
import javax.naming.Binding;
import javax.naming.Context;
import javax.naming.InitialContext;
diff --git a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEarLibTest/client/AppClient.java b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEarLibTest/client/AppClient.java
index de0979c..fbb21b3 100755
--- a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEarLibTest/client/AppClient.java
+++ b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEarLibTest/client/AppClient.java
@@ -16,7 +16,7 @@
package client;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.util.Collection;
import java.util.List;
diff --git a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEarLibTest/ejb/Test.java b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEarLibTest/ejb/Test.java
index 9cbfceb..208306c 100755
--- a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEarLibTest/ejb/Test.java
+++ b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEarLibTest/ejb/Test.java
@@ -16,7 +16,7 @@
package ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
import entity.Customer;
diff --git a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEarLibTest/ejb/TestBean.java b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEarLibTest/ejb/TestBean.java
index 7182a0f..a23e512 100755
--- a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEarLibTest/ejb/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEarLibTest/ejb/TestBean.java
@@ -16,8 +16,8 @@
package ejb;
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
+import jakarta.ejb.Remote;
+import jakarta.ejb.Stateless;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import javax.persistence.Query;
diff --git a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEjbTest/client/AppClient.java b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEjbTest/client/AppClient.java
index de0979c..fbb21b3 100755
--- a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEjbTest/client/AppClient.java
+++ b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEjbTest/client/AppClient.java
@@ -16,7 +16,7 @@
package client;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.util.Collection;
import java.util.List;
diff --git a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEjbTest/ejb/Test.java b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEjbTest/ejb/Test.java
index 9cbfceb..208306c 100755
--- a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEjbTest/ejb/Test.java
+++ b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEjbTest/ejb/Test.java
@@ -16,7 +16,7 @@
package ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
import entity.Customer;
diff --git a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEjbTest/ejb/TestBean.java b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEjbTest/ejb/TestBean.java
index 7182a0f..a23e512 100755
--- a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEjbTest/ejb/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEjbTest/ejb/TestBean.java
@@ -16,8 +16,8 @@
package ejb;
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
+import jakarta.ejb.Remote;
+import jakarta.ejb.Stateless;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import javax.persistence.Query;
diff --git a/appserver/tests/appserv-tests/devtests/security/anyone/client/Client.java b/appserver/tests/appserv-tests/devtests/security/anyone/client/Client.java
index 30b41d5..945a8d2 100644
--- a/appserver/tests/appserv-tests/devtests/security/anyone/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/security/anyone/client/Client.java
@@ -21,7 +21,7 @@
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.net.Socket;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
diff --git a/appserver/tests/appserv-tests/devtests/security/anyone/ejb/HelloEjb.java b/appserver/tests/appserv-tests/devtests/security/anyone/ejb/HelloEjb.java
index 8bfbc00..c885758 100644
--- a/appserver/tests/appserv-tests/devtests/security/anyone/ejb/HelloEjb.java
+++ b/appserver/tests/appserv-tests/devtests/security/anyone/ejb/HelloEjb.java
@@ -19,9 +19,9 @@
import jakarta.annotation.Resource;
import jakarta.annotation.security.DeclareRoles;
import jakarta.annotation.security.RolesAllowed;
-import javax.ejb.Remote;
-import javax.ejb.SessionContext;
-import javax.ejb.Stateless;
+import jakarta.ejb.Remote;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.Stateless;
@Stateless
@Remote({Hello.class})
diff --git a/appserver/tests/appserv-tests/devtests/security/cplogin/ejb/ConverterBean.java b/appserver/tests/appserv-tests/devtests/security/cplogin/ejb/ConverterBean.java
index 1537c52..6a82460 100644
--- a/appserver/tests/appserv-tests/devtests/security/cplogin/ejb/ConverterBean.java
+++ b/appserver/tests/appserv-tests/devtests/security/cplogin/ejb/ConverterBean.java
@@ -17,8 +17,8 @@
package com.sun.devtest.security.plogin.converter.ejb;
import java.rmi.RemoteException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
import java.math.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/security/cplogin/ejb/ConverterRemote.java b/appserver/tests/appserv-tests/devtests/security/cplogin/ejb/ConverterRemote.java
index 64d1062..bc31d75 100644
--- a/appserver/tests/appserv-tests/devtests/security/cplogin/ejb/ConverterRemote.java
+++ b/appserver/tests/appserv-tests/devtests/security/cplogin/ejb/ConverterRemote.java
@@ -16,7 +16,7 @@
package com.sun.devtest.security.plogin.converter.ejb;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
import java.rmi.RemoteException;
import java.math.*;
diff --git a/appserver/tests/appserv-tests/devtests/security/cplogin/ejb/ConverterRemoteHome.java b/appserver/tests/appserv-tests/devtests/security/cplogin/ejb/ConverterRemoteHome.java
index 681994f..5a3e317 100644
--- a/appserver/tests/appserv-tests/devtests/security/cplogin/ejb/ConverterRemoteHome.java
+++ b/appserver/tests/appserv-tests/devtests/security/cplogin/ejb/ConverterRemoteHome.java
@@ -18,8 +18,8 @@
import java.io.Serializable;
import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBHome;
/**
* Home interface for the <code>ConverterBean</code>. Clients generally use home interface
diff --git a/appserver/tests/appserv-tests/devtests/security/ejb-auth-async/scheduler-service/src/main/java/org/glassfish/test/auth-propagation/AppResource.java b/appserver/tests/appserv-tests/devtests/security/ejb-auth-async/scheduler-service/src/main/java/org/glassfish/test/auth-propagation/AppResource.java
index 5d2b4cd..b4c1aae 100644
--- a/appserver/tests/appserv-tests/devtests/security/ejb-auth-async/scheduler-service/src/main/java/org/glassfish/test/auth-propagation/AppResource.java
+++ b/appserver/tests/appserv-tests/devtests/security/ejb-auth-async/scheduler-service/src/main/java/org/glassfish/test/auth-propagation/AppResource.java
@@ -16,7 +16,7 @@
package org.glassfish.test.authpropagation;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import javax.servlet.http.HttpServletRequest;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.POST;
diff --git a/appserver/tests/appserv-tests/devtests/security/ejb-auth-async/scheduler-service/src/main/java/org/glassfish/test/auth-propagation/DataSourceInitializer.java b/appserver/tests/appserv-tests/devtests/security/ejb-auth-async/scheduler-service/src/main/java/org/glassfish/test/auth-propagation/DataSourceInitializer.java
index 4a0d598..25b9968 100644
--- a/appserver/tests/appserv-tests/devtests/security/ejb-auth-async/scheduler-service/src/main/java/org/glassfish/test/auth-propagation/DataSourceInitializer.java
+++ b/appserver/tests/appserv-tests/devtests/security/ejb-auth-async/scheduler-service/src/main/java/org/glassfish/test/auth-propagation/DataSourceInitializer.java
@@ -18,8 +18,8 @@
import jakarta.annotation.*;
import jakarta.annotation.sql.DataSourceDefinition;
-import javax.ejb.Singleton;
-import javax.ejb.Startup;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import javax.sql.DataSource;
diff --git a/appserver/tests/appserv-tests/devtests/security/ejb-auth-async/scheduler-service/src/main/java/org/glassfish/test/auth-propagation/SchedulerService.java b/appserver/tests/appserv-tests/devtests/security/ejb-auth-async/scheduler-service/src/main/java/org/glassfish/test/auth-propagation/SchedulerService.java
index ea60849..a2cefe8 100644
--- a/appserver/tests/appserv-tests/devtests/security/ejb-auth-async/scheduler-service/src/main/java/org/glassfish/test/auth-propagation/SchedulerService.java
+++ b/appserver/tests/appserv-tests/devtests/security/ejb-auth-async/scheduler-service/src/main/java/org/glassfish/test/auth-propagation/SchedulerService.java
@@ -18,7 +18,7 @@
import jakarta.annotation.PostConstruct;
import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.util.logging.Logger;
@Singleton
diff --git a/appserver/tests/appserv-tests/devtests/security/ejb-auth-async/scheduler-service/src/main/java/org/glassfish/test/auth-propagation/Service.java b/appserver/tests/appserv-tests/devtests/security/ejb-auth-async/scheduler-service/src/main/java/org/glassfish/test/auth-propagation/Service.java
index ee66e55..2cafa11 100644
--- a/appserver/tests/appserv-tests/devtests/security/ejb-auth-async/scheduler-service/src/main/java/org/glassfish/test/auth-propagation/Service.java
+++ b/appserver/tests/appserv-tests/devtests/security/ejb-auth-async/scheduler-service/src/main/java/org/glassfish/test/auth-propagation/Service.java
@@ -17,10 +17,10 @@
package org.glassfish.test.authpropagation;
import jakarta.annotation.Resource;
-import javax.ejb.Asynchronous;
-import javax.ejb.LocalBean;
-import javax.ejb.SessionContext;
-import javax.ejb.Stateless;
+import jakarta.ejb.Asynchronous;
+import jakarta.ejb.LocalBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.Stateless;
import java.util.logging.Logger;
@Stateless
diff --git a/appserver/tests/appserv-tests/devtests/security/ejb-mutual-ssl/ejb/ConverterBean.java b/appserver/tests/appserv-tests/devtests/security/ejb-mutual-ssl/ejb/ConverterBean.java
index 9e2a374..24ab044 100644
--- a/appserver/tests/appserv-tests/devtests/security/ejb-mutual-ssl/ejb/ConverterBean.java
+++ b/appserver/tests/appserv-tests/devtests/security/ejb-mutual-ssl/ejb/ConverterBean.java
@@ -17,8 +17,8 @@
package com.sun.s1peqe.security.ssl.converter.ejb;
import java.rmi.RemoteException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
import java.math.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/security/ejb-mutual-ssl/ejb/ConverterRemote.java b/appserver/tests/appserv-tests/devtests/security/ejb-mutual-ssl/ejb/ConverterRemote.java
index ed4894a..aa1e91b 100644
--- a/appserver/tests/appserv-tests/devtests/security/ejb-mutual-ssl/ejb/ConverterRemote.java
+++ b/appserver/tests/appserv-tests/devtests/security/ejb-mutual-ssl/ejb/ConverterRemote.java
@@ -16,7 +16,7 @@
package com.sun.s1peqe.security.ssl.converter.ejb;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
import java.rmi.RemoteException;
import java.math.*;
diff --git a/appserver/tests/appserv-tests/devtests/security/ejb-mutual-ssl/ejb/ConverterRemoteHome.java b/appserver/tests/appserv-tests/devtests/security/ejb-mutual-ssl/ejb/ConverterRemoteHome.java
index 9d9a0f2..d27402a 100644
--- a/appserver/tests/appserv-tests/devtests/security/ejb-mutual-ssl/ejb/ConverterRemoteHome.java
+++ b/appserver/tests/appserv-tests/devtests/security/ejb-mutual-ssl/ejb/ConverterRemoteHome.java
@@ -18,8 +18,8 @@
import java.io.Serializable;
import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBHome;
/**
* Home interface for the <code>ConverterBean</code>. Clients generally use home interface
diff --git a/appserver/tests/appserv-tests/devtests/security/ejb-oneway-ssl/ejb/ConverterBean.java b/appserver/tests/appserv-tests/devtests/security/ejb-oneway-ssl/ejb/ConverterBean.java
index 9e2a374..24ab044 100644
--- a/appserver/tests/appserv-tests/devtests/security/ejb-oneway-ssl/ejb/ConverterBean.java
+++ b/appserver/tests/appserv-tests/devtests/security/ejb-oneway-ssl/ejb/ConverterBean.java
@@ -17,8 +17,8 @@
package com.sun.s1peqe.security.ssl.converter.ejb;
import java.rmi.RemoteException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
import java.math.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/security/ejb-oneway-ssl/ejb/ConverterRemote.java b/appserver/tests/appserv-tests/devtests/security/ejb-oneway-ssl/ejb/ConverterRemote.java
index ed4894a..aa1e91b 100644
--- a/appserver/tests/appserv-tests/devtests/security/ejb-oneway-ssl/ejb/ConverterRemote.java
+++ b/appserver/tests/appserv-tests/devtests/security/ejb-oneway-ssl/ejb/ConverterRemote.java
@@ -16,7 +16,7 @@
package com.sun.s1peqe.security.ssl.converter.ejb;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
import java.rmi.RemoteException;
import java.math.*;
diff --git a/appserver/tests/appserv-tests/devtests/security/ejb-oneway-ssl/ejb/ConverterRemoteHome.java b/appserver/tests/appserv-tests/devtests/security/ejb-oneway-ssl/ejb/ConverterRemoteHome.java
index 9d9a0f2..d27402a 100644
--- a/appserver/tests/appserv-tests/devtests/security/ejb-oneway-ssl/ejb/ConverterRemoteHome.java
+++ b/appserver/tests/appserv-tests/devtests/security/ejb-oneway-ssl/ejb/ConverterRemoteHome.java
@@ -18,8 +18,8 @@
import java.io.Serializable;
import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBHome;
/**
* Home interface for the <code>ConverterBean</code>. Clients generally use home interface
diff --git a/appserver/tests/appserv-tests/devtests/security/jaccmr8/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/security/jaccmr8/ejb/HelloEJB.java
index d5dc4c8..c36560b 100644
--- a/appserver/tests/appserv-tests/devtests/security/jaccmr8/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/security/jaccmr8/ejb/HelloEJB.java
@@ -19,8 +19,8 @@
import java.security.Principal;
import jakarta.annotation.Resource;
-import javax.ejb.SessionContext;
-import javax.ejb.Stateless;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.Stateless;
@Stateless
public class HelloEJB implements Hello {
diff --git a/appserver/tests/appserv-tests/devtests/security/jaccmr8/ejb/HelloStatefulEJB.java b/appserver/tests/appserv-tests/devtests/security/jaccmr8/ejb/HelloStatefulEJB.java
index ac2ed3d..79524c3 100644
--- a/appserver/tests/appserv-tests/devtests/security/jaccmr8/ejb/HelloStatefulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/security/jaccmr8/ejb/HelloStatefulEJB.java
@@ -23,8 +23,8 @@
import jakarta.annotation.security.DeclareRoles;
import jakarta.annotation.security.RolesAllowed;
-import javax.ejb.SessionContext;
-import javax.ejb.Stateful;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.Stateful;
@DeclareRoles({"javaUsers"})
diff --git a/appserver/tests/appserv-tests/devtests/security/jaccmr8/web/Servlet.java b/appserver/tests/appserv-tests/devtests/security/jaccmr8/web/Servlet.java
index 96cd75d..1f83573 100644
--- a/appserver/tests/appserv-tests/devtests/security/jaccmr8/web/Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/security/jaccmr8/web/Servlet.java
@@ -20,8 +20,8 @@
import javax.servlet.*;
import javax.servlet.http.*;
import javax.naming.*;
-import javax.ejb.EJB;
-import javax.ejb.EJBs;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBs;
import java.net.URLEncoder;
import java.net.URLDecoder;
import java.security.Principal;
diff --git a/appserver/tests/appserv-tests/devtests/security/jmac/soap/ejbws/HelloEjb.java b/appserver/tests/appserv-tests/devtests/security/jmac/soap/ejbws/HelloEjb.java
index 14296fd..48a46b6 100644
--- a/appserver/tests/appserv-tests/devtests/security/jmac/soap/ejbws/HelloEjb.java
+++ b/appserver/tests/appserv-tests/devtests/security/jmac/soap/ejbws/HelloEjb.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.security.jmac.soap.ejbws;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import jakarta.jws.WebService;
@Stateless
diff --git a/appserver/tests/appserv-tests/devtests/security/jmac/soapDefault/ejbws/HelloEjb.java b/appserver/tests/appserv-tests/devtests/security/jmac/soapDefault/ejbws/HelloEjb.java
index ec8c068..be708d7 100644
--- a/appserver/tests/appserv-tests/devtests/security/jmac/soapDefault/ejbws/HelloEjb.java
+++ b/appserver/tests/appserv-tests/devtests/security/jmac/soapDefault/ejbws/HelloEjb.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.security.jmac.soapdefault.ejbws;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import jakarta.jws.WebService;
@Stateless
diff --git a/appserver/tests/appserv-tests/devtests/security/jmac/soapEmbedded/ejbws/HelloEjb.java b/appserver/tests/appserv-tests/devtests/security/jmac/soapEmbedded/ejbws/HelloEjb.java
index f2b925b..f0b9527 100644
--- a/appserver/tests/appserv-tests/devtests/security/jmac/soapEmbedded/ejbws/HelloEjb.java
+++ b/appserver/tests/appserv-tests/devtests/security/jmac/soapEmbedded/ejbws/HelloEjb.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.security.jmac.soapembedded.ejbws;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import jakarta.jws.WebService;
@Stateless
diff --git a/appserver/tests/appserv-tests/devtests/security/jsp2sful/profile/ProfileInfoBean.java b/appserver/tests/appserv-tests/devtests/security/jsp2sful/profile/ProfileInfoBean.java
index 1c3ac18..b2b3e0a 100644
--- a/appserver/tests/appserv-tests/devtests/security/jsp2sful/profile/ProfileInfoBean.java
+++ b/appserver/tests/appserv-tests/devtests/security/jsp2sful/profile/ProfileInfoBean.java
@@ -16,12 +16,12 @@
package profile;
-import javax.ejb.SessionContext;
-import javax.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.SessionBean;
import java.util.Vector;
import java.lang.String;
import java.util.Iterator;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJBException;
import java.rmi.RemoteException;
/**
*
@@ -62,7 +62,7 @@
}
- public void setSessionContext(javax.ejb.SessionContext sessionContext) {
+ public void setSessionContext(jakarta.ejb.SessionContext sessionContext) {
sc = sessionContext;
}
diff --git a/appserver/tests/appserv-tests/devtests/security/jsp2sful/profile/ProfileInfoHome.java b/appserver/tests/appserv-tests/devtests/security/jsp2sful/profile/ProfileInfoHome.java
index 568ed0c..f47ad2a 100644
--- a/appserver/tests/appserv-tests/devtests/security/jsp2sful/profile/ProfileInfoHome.java
+++ b/appserver/tests/appserv-tests/devtests/security/jsp2sful/profile/ProfileInfoHome.java
@@ -16,7 +16,7 @@
package profile;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
/**
*
* @author swchan2
@@ -24,6 +24,6 @@
public interface ProfileInfoHome extends EJBHome{
public ProfileInfoRemote create(String name)
- throws java.rmi.RemoteException, javax.ejb.CreateException;
+ throws java.rmi.RemoteException, jakarta.ejb.CreateException;
}
diff --git a/appserver/tests/appserv-tests/devtests/security/jsp2sful/profile/ProfileInfoRemote.java b/appserver/tests/appserv-tests/devtests/security/jsp2sful/profile/ProfileInfoRemote.java
index 31683e4..1ba4359 100644
--- a/appserver/tests/appserv-tests/devtests/security/jsp2sful/profile/ProfileInfoRemote.java
+++ b/appserver/tests/appserv-tests/devtests/security/jsp2sful/profile/ProfileInfoRemote.java
@@ -17,7 +17,7 @@
package profile;
import java.rmi.RemoteException;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
/**
* ProfileInfo Stateful Session Bean. Test JSR 115 authorization.
diff --git a/appserver/tests/appserv-tests/devtests/security/ldapRealmPerApp/shopping/RpaBean.java b/appserver/tests/appserv-tests/devtests/security/ldapRealmPerApp/shopping/RpaBean.java
index 9aac322..d6462de 100644
--- a/appserver/tests/appserv-tests/devtests/security/ldapRealmPerApp/shopping/RpaBean.java
+++ b/appserver/tests/appserv-tests/devtests/security/ldapRealmPerApp/shopping/RpaBean.java
@@ -22,9 +22,9 @@
package shopping;
-import javax.ejb.SessionContext;
-import javax.ejb.SessionBean;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.EJBException;
import java.rmi.RemoteException;
import java.util.ArrayList;
import java.util.List;
@@ -107,7 +107,7 @@
}
- public void setSessionContext(javax.ejb.SessionContext sessionContext) {
+ public void setSessionContext(jakarta.ejb.SessionContext sessionContext) {
sc = sessionContext;
}
diff --git a/appserver/tests/appserv-tests/devtests/security/ldapRealmPerApp/shopping/RpaHome.java b/appserver/tests/appserv-tests/devtests/security/ldapRealmPerApp/shopping/RpaHome.java
index 73cf369..3da5d67 100644
--- a/appserver/tests/appserv-tests/devtests/security/ldapRealmPerApp/shopping/RpaHome.java
+++ b/appserver/tests/appserv-tests/devtests/security/ldapRealmPerApp/shopping/RpaHome.java
@@ -21,7 +21,7 @@
*/
package shopping;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
/**
*
* @author Harpreet Singh
@@ -29,6 +29,6 @@
public interface RpaHome extends EJBHome{
public RpaRemote create(java.lang.String shopperName)
- throws java.rmi.RemoteException, javax.ejb.CreateException;
+ throws java.rmi.RemoteException, jakarta.ejb.CreateException;
}
diff --git a/appserver/tests/appserv-tests/devtests/security/ldapRealmPerApp/shopping/RpaRemote.java b/appserver/tests/appserv-tests/devtests/security/ldapRealmPerApp/shopping/RpaRemote.java
index d5b1bb9..fb8a773 100644
--- a/appserver/tests/appserv-tests/devtests/security/ldapRealmPerApp/shopping/RpaRemote.java
+++ b/appserver/tests/appserv-tests/devtests/security/ldapRealmPerApp/shopping/RpaRemote.java
@@ -21,7 +21,7 @@
*/
package shopping;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
/**
* Shopping Cart Stateful Session Bean. Just tests -Dj2eelogin.name
* -Dj2eelogin.password system properties.
diff --git a/appserver/tests/appserv-tests/devtests/security/mdb/client/Client.java b/appserver/tests/appserv-tests/devtests/security/mdb/client/Client.java
index a23ead3..bd90c33 100644
--- a/appserver/tests/appserv-tests/devtests/security/mdb/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/security/mdb/client/Client.java
@@ -18,7 +18,7 @@
import java.io.*;
import java.util.*;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
import jakarta.jms.*;
import jakarta.annotation.Resource;
diff --git a/appserver/tests/appserv-tests/devtests/security/mdb/ejb/HelloStateful.java b/appserver/tests/appserv-tests/devtests/security/mdb/ejb/HelloStateful.java
index 6d94f42..58ae398 100644
--- a/appserver/tests/appserv-tests/devtests/security/mdb/ejb/HelloStateful.java
+++ b/appserver/tests/appserv-tests/devtests/security/mdb/ejb/HelloStateful.java
@@ -18,8 +18,8 @@
import jakarta.annotation.security.RolesAllowed;
-import javax.ejb.Stateful;
-import javax.ejb.Remove;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.Remove;
import jakarta.annotation.PreDestroy;
// Hello1 interface is not annotated with @Local. If the
diff --git a/appserver/tests/appserv-tests/devtests/security/mdb/ejb/HelloStateless.java b/appserver/tests/appserv-tests/devtests/security/mdb/ejb/HelloStateless.java
index 7e1c5ce..7740e37 100644
--- a/appserver/tests/appserv-tests/devtests/security/mdb/ejb/HelloStateless.java
+++ b/appserver/tests/appserv-tests/devtests/security/mdb/ejb/HelloStateless.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.security.mdb;
import jakarta.annotation.security.RolesAllowed;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
// Hello1 interface is not annotated with @Local. If the
// bean only implements one interface it is assumed to be
diff --git a/appserver/tests/appserv-tests/devtests/security/mdb/ejb/MessageBean.java b/appserver/tests/appserv-tests/devtests/security/mdb/ejb/MessageBean.java
index d1997c8..67eb919 100644
--- a/appserver/tests/appserv-tests/devtests/security/mdb/ejb/MessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/security/mdb/ejb/MessageBean.java
@@ -16,14 +16,14 @@
package com.sun.s1asdev.security.mdb;
-import javax.ejb.AccessLocalException;
-import javax.ejb.MessageDriven;
-import javax.ejb.EJBException;
-import javax.ejb.NoSuchEJBException;
-import javax.ejb.EJB;
-import javax.ejb.TransactionManagement;
-import javax.ejb.TransactionManagementType;
-import javax.ejb.ActivationConfigProperty;
+import jakarta.ejb.AccessLocalException;
+import jakarta.ejb.MessageDriven;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.NoSuchEJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.TransactionManagement;
+import jakarta.ejb.TransactionManagementType;
+import jakarta.ejb.ActivationConfigProperty;
import jakarta.jms.MessageListener;
import jakarta.jms.Message;
diff --git a/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/ejb1/MessageBean1.java b/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/ejb1/MessageBean1.java
index d375f6e..b4c56d6 100644
--- a/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/ejb1/MessageBean1.java
+++ b/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/ejb1/MessageBean1.java
@@ -17,8 +17,8 @@
package com.sun.s1asdev.security.simpleMultiRoleMapping.ejb1;
import jakarta.annotation.security.RolesAllowed;
-import javax.ejb.Local;
-import javax.ejb.Stateless;
+import jakarta.ejb.Local;
+import jakarta.ejb.Stateless;
@Stateless
@Local({MessageLocal1.class})
diff --git a/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/ejb1/MessageLocal1.java b/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/ejb1/MessageLocal1.java
index d885246..1d6ceff 100644
--- a/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/ejb1/MessageLocal1.java
+++ b/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/ejb1/MessageLocal1.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.security.simpleMultiRoleMapping.ejb1;
-import javax.ejb.Local;
+import jakarta.ejb.Local;
/**
* This is the business interface for Message enterprise bean.
diff --git a/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/ejb2/MessageBean2.java b/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/ejb2/MessageBean2.java
index cb7a3d0..a4352a8 100644
--- a/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/ejb2/MessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/ejb2/MessageBean2.java
@@ -17,8 +17,8 @@
package com.sun.s1asdev.security.simpleMultiRoleMapping.ejb2;
import jakarta.annotation.security.RolesAllowed;
-import javax.ejb.Local;
-import javax.ejb.Stateless;
+import jakarta.ejb.Local;
+import jakarta.ejb.Stateless;
@Stateless
@Local({MessageLocal2.class})
diff --git a/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/ejb2/MessageLocal2.java b/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/ejb2/MessageLocal2.java
index 4a2c5f4..0202395 100644
--- a/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/ejb2/MessageLocal2.java
+++ b/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/ejb2/MessageLocal2.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.security.simpleMultiRoleMapping.ejb2;
-import javax.ejb.Local;
+import jakarta.ejb.Local;
/**
* This is the business interface for Message enterprise bean.
diff --git a/appserver/tests/appserv-tests/devtests/security/negativeRealmPerApp/client/NegativeRPAClient.java b/appserver/tests/appserv-tests/devtests/security/negativeRealmPerApp/client/NegativeRPAClient.java
index 3e2dca5..a5d6796 100644
--- a/appserver/tests/appserv-tests/devtests/security/negativeRealmPerApp/client/NegativeRPAClient.java
+++ b/appserver/tests/appserv-tests/devtests/security/negativeRealmPerApp/client/NegativeRPAClient.java
@@ -18,7 +18,7 @@
import java.io.*;
import java.util.*;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
import javax.naming.*;
import javax.rmi.PortableRemoteObject;
import org.omg.CORBA.ORB;
diff --git a/appserver/tests/appserv-tests/devtests/security/negativeRealmPerApp/shopping/NegativeRPABean.java b/appserver/tests/appserv-tests/devtests/security/negativeRealmPerApp/shopping/NegativeRPABean.java
index d126ae5..804ca35 100644
--- a/appserver/tests/appserv-tests/devtests/security/negativeRealmPerApp/shopping/NegativeRPABean.java
+++ b/appserver/tests/appserv-tests/devtests/security/negativeRealmPerApp/shopping/NegativeRPABean.java
@@ -25,9 +25,9 @@
import java.rmi.RemoteException;
import java.util.Iterator;
import java.util.Vector;
-import javax.ejb.EJBException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/security/negativeRealmPerApp/shopping/NegativeRPAHome.java b/appserver/tests/appserv-tests/devtests/security/negativeRealmPerApp/shopping/NegativeRPAHome.java
index aaa89cc..303f89b 100644
--- a/appserver/tests/appserv-tests/devtests/security/negativeRealmPerApp/shopping/NegativeRPAHome.java
+++ b/appserver/tests/appserv-tests/devtests/security/negativeRealmPerApp/shopping/NegativeRPAHome.java
@@ -20,7 +20,7 @@
*/
package shopping;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
import shopping.NegativeRPARemote;
/**
*
@@ -30,6 +30,6 @@
public interface NegativeRPAHome extends EJBHome{
public NegativeRPARemote create(java.lang.String shopperName)
- throws java.rmi.RemoteException, javax.ejb.CreateException;
+ throws java.rmi.RemoteException, jakarta.ejb.CreateException;
}
diff --git a/appserver/tests/appserv-tests/devtests/security/negativeRealmPerApp/shopping/NegativeRPARemote.java b/appserver/tests/appserv-tests/devtests/security/negativeRealmPerApp/shopping/NegativeRPARemote.java
index c65f0fe..7afd1d7 100644
--- a/appserver/tests/appserv-tests/devtests/security/negativeRealmPerApp/shopping/NegativeRPARemote.java
+++ b/appserver/tests/appserv-tests/devtests/security/negativeRealmPerApp/shopping/NegativeRPARemote.java
@@ -21,7 +21,7 @@
*/
package shopping;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
/**
* Negative RealmPerAPP Stateful Session Bean.
* Tries to log into a non existent realm
diff --git a/appserver/tests/appserv-tests/devtests/security/plogin/standalone/ejb/MySession1Bean.java b/appserver/tests/appserv-tests/devtests/security/plogin/standalone/ejb/MySession1Bean.java
index b614211..556cacd 100644
--- a/appserver/tests/appserv-tests/devtests/security/plogin/standalone/ejb/MySession1Bean.java
+++ b/appserver/tests/appserv-tests/devtests/security/plogin/standalone/ejb/MySession1Bean.java
@@ -14,7 +14,7 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/
-import javax.ejb.*;
+import jakarta.ejb.*;
/**
* This is the bean class for the MySession1Bean enterprise bean.
@@ -23,28 +23,28 @@
private SessionContext context;
/**
- * @see javax.ejb.SessionBean#setSessionContext(javax.ejb.SessionContext)
+ * @see jakarta.ejb.SessionBean#setSessionContext(jakarta.ejb.SessionContext)
*/
public void setSessionContext(SessionContext aContext) {
context = aContext;
}
/**
- * @see javax.ejb.SessionBean#ejbActivate()
+ * @see jakarta.ejb.SessionBean#ejbActivate()
*/
public void ejbActivate() {
}
/**
- * @see javax.ejb.SessionBean#ejbPassivate()
+ * @see jakarta.ejb.SessionBean#ejbPassivate()
*/
public void ejbPassivate() {
}
/**
- * @see javax.ejb.SessionBean#ejbRemove()
+ * @see jakarta.ejb.SessionBean#ejbRemove()
*/
public void ejbRemove() {
diff --git a/appserver/tests/appserv-tests/devtests/security/plogin/standalone/ejb/MySession1Remote.java b/appserver/tests/appserv-tests/devtests/security/plogin/standalone/ejb/MySession1Remote.java
index 57f82ec..798d406 100644
--- a/appserver/tests/appserv-tests/devtests/security/plogin/standalone/ejb/MySession1Remote.java
+++ b/appserver/tests/appserv-tests/devtests/security/plogin/standalone/ejb/MySession1Remote.java
@@ -14,7 +14,7 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
/**
diff --git a/appserver/tests/appserv-tests/devtests/security/plogin/standalone/ejb/MySession1RemoteHome.java b/appserver/tests/appserv-tests/devtests/security/plogin/standalone/ejb/MySession1RemoteHome.java
index daada77..7ebc8f0 100644
--- a/appserver/tests/appserv-tests/devtests/security/plogin/standalone/ejb/MySession1RemoteHome.java
+++ b/appserver/tests/appserv-tests/devtests/security/plogin/standalone/ejb/MySession1RemoteHome.java
@@ -15,8 +15,8 @@
*/
import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBHome;
/**
diff --git a/appserver/tests/appserv-tests/devtests/security/realmPerApp/client/RpaClient.java b/appserver/tests/appserv-tests/devtests/security/realmPerApp/client/RpaClient.java
index ce7a95d..43d0772 100644
--- a/appserver/tests/appserv-tests/devtests/security/realmPerApp/client/RpaClient.java
+++ b/appserver/tests/appserv-tests/devtests/security/realmPerApp/client/RpaClient.java
@@ -18,7 +18,7 @@
import java.io.*;
import java.util.*;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
import javax.naming.*;
import javax.rmi.PortableRemoteObject;
import org.omg.CORBA.ORB;
diff --git a/appserver/tests/appserv-tests/devtests/security/realmPerApp/shopping/RpaBean.java b/appserver/tests/appserv-tests/devtests/security/realmPerApp/shopping/RpaBean.java
index fc2064f..c73946d 100644
--- a/appserver/tests/appserv-tests/devtests/security/realmPerApp/shopping/RpaBean.java
+++ b/appserver/tests/appserv-tests/devtests/security/realmPerApp/shopping/RpaBean.java
@@ -22,12 +22,12 @@
package shopping;
-import javax.ejb.SessionContext;
-import javax.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.SessionBean;
import java.util.Vector;
import java.lang.String;
import java.util.Iterator;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJBException;
import java.rmi.RemoteException;
/**
*
@@ -114,7 +114,7 @@
}
- public void setSessionContext(javax.ejb.SessionContext sessionContext) {
+ public void setSessionContext(jakarta.ejb.SessionContext sessionContext) {
sc = sessionContext;
}
diff --git a/appserver/tests/appserv-tests/devtests/security/realmPerApp/shopping/RpaHome.java b/appserver/tests/appserv-tests/devtests/security/realmPerApp/shopping/RpaHome.java
index e52095e..d4262d0 100644
--- a/appserver/tests/appserv-tests/devtests/security/realmPerApp/shopping/RpaHome.java
+++ b/appserver/tests/appserv-tests/devtests/security/realmPerApp/shopping/RpaHome.java
@@ -21,7 +21,7 @@
*/
package shopping;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
import shopping.RpaRemote;
/**
*
@@ -30,6 +30,6 @@
public interface RpaHome extends EJBHome{
public RpaRemote create(java.lang.String shopperName)
- throws java.rmi.RemoteException, javax.ejb.CreateException;
+ throws java.rmi.RemoteException, jakarta.ejb.CreateException;
}
diff --git a/appserver/tests/appserv-tests/devtests/security/realmPerApp/shopping/RpaRemote.java b/appserver/tests/appserv-tests/devtests/security/realmPerApp/shopping/RpaRemote.java
index d5b1bb9..fb8a773 100644
--- a/appserver/tests/appserv-tests/devtests/security/realmPerApp/shopping/RpaRemote.java
+++ b/appserver/tests/appserv-tests/devtests/security/realmPerApp/shopping/RpaRemote.java
@@ -21,7 +21,7 @@
*/
package shopping;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
/**
* Shopping Cart Stateful Session Bean. Just tests -Dj2eelogin.name
* -Dj2eelogin.password system properties.
diff --git a/appserver/tests/appserv-tests/devtests/security/sameEjbName/client/Client.java b/appserver/tests/appserv-tests/devtests/security/sameEjbName/client/Client.java
index 51ae847..a0c2e43 100644
--- a/appserver/tests/appserv-tests/devtests/security/sameEjbName/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/security/sameEjbName/client/Client.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.security.sameEjbName.client;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
diff --git a/appserver/tests/appserv-tests/devtests/security/sameEjbName/ejb/HelloEjb.java b/appserver/tests/appserv-tests/devtests/security/sameEjbName/ejb/HelloEjb.java
index 7e4da18..a47e4fc 100644
--- a/appserver/tests/appserv-tests/devtests/security/sameEjbName/ejb/HelloEjb.java
+++ b/appserver/tests/appserv-tests/devtests/security/sameEjbName/ejb/HelloEjb.java
@@ -17,8 +17,8 @@
package com.sun.s1asdev.security.sameEjbName.ejb;
import jakarta.annotation.security.RolesAllowed;
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
+import jakarta.ejb.Remote;
+import jakarta.ejb.Stateless;
@Stateless
@Remote({Hello.class})
diff --git a/appserver/tests/appserv-tests/devtests/security/sameEjbName/ejb2/HelloEjb.java b/appserver/tests/appserv-tests/devtests/security/sameEjbName/ejb2/HelloEjb.java
index 62818cd..5a5c42e 100644
--- a/appserver/tests/appserv-tests/devtests/security/sameEjbName/ejb2/HelloEjb.java
+++ b/appserver/tests/appserv-tests/devtests/security/sameEjbName/ejb2/HelloEjb.java
@@ -17,8 +17,8 @@
package com.sun.s1asdev.security.sameEjbName.ejb2;
import jakarta.annotation.security.RolesAllowed;
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
+import jakarta.ejb.Remote;
+import jakarta.ejb.Stateless;
@Stateless
@Remote({Hello.class})
diff --git a/appserver/tests/appserv-tests/devtests/security/sful/client/ShoppingCartClient.java b/appserver/tests/appserv-tests/devtests/security/sful/client/ShoppingCartClient.java
index 6576ac1..8ab18d4 100644
--- a/appserver/tests/appserv-tests/devtests/security/sful/client/ShoppingCartClient.java
+++ b/appserver/tests/appserv-tests/devtests/security/sful/client/ShoppingCartClient.java
@@ -18,7 +18,7 @@
import java.io.*;
import java.util.*;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
import javax.naming.*;
import javax.rmi.PortableRemoteObject;
import org.omg.CORBA.ORB;
diff --git a/appserver/tests/appserv-tests/devtests/security/sful/shopping/ShoppingCartBean.java b/appserver/tests/appserv-tests/devtests/security/sful/shopping/ShoppingCartBean.java
index d7d63b6..215d324 100644
--- a/appserver/tests/appserv-tests/devtests/security/sful/shopping/ShoppingCartBean.java
+++ b/appserver/tests/appserv-tests/devtests/security/sful/shopping/ShoppingCartBean.java
@@ -22,12 +22,12 @@
package shopping;
-import javax.ejb.SessionContext;
-import javax.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.SessionBean;
import java.util.Vector;
import java.lang.String;
import java.util.Iterator;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJBException;
import java.rmi.RemoteException;
/**
*
@@ -119,7 +119,7 @@
}
- public void setSessionContext(javax.ejb.SessionContext sessionContext) {
+ public void setSessionContext(jakarta.ejb.SessionContext sessionContext) {
sc = sessionContext;
}
diff --git a/appserver/tests/appserv-tests/devtests/security/sful/shopping/ShoppingCartHome.java b/appserver/tests/appserv-tests/devtests/security/sful/shopping/ShoppingCartHome.java
index 90baa62..9d44c82 100644
--- a/appserver/tests/appserv-tests/devtests/security/sful/shopping/ShoppingCartHome.java
+++ b/appserver/tests/appserv-tests/devtests/security/sful/shopping/ShoppingCartHome.java
@@ -21,7 +21,7 @@
*/
package shopping;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
import shopping.ShoppingCartRemote;
/**
*
@@ -30,6 +30,6 @@
public interface ShoppingCartHome extends EJBHome{
public ShoppingCartRemote create(java.lang.String shopperName)
- throws java.rmi.RemoteException, javax.ejb.CreateException;
+ throws java.rmi.RemoteException, jakarta.ejb.CreateException;
}
diff --git a/appserver/tests/appserv-tests/devtests/security/sful/shopping/ShoppingCartRemote.java b/appserver/tests/appserv-tests/devtests/security/sful/shopping/ShoppingCartRemote.java
index 98f39c5..bb324d1 100644
--- a/appserver/tests/appserv-tests/devtests/security/sful/shopping/ShoppingCartRemote.java
+++ b/appserver/tests/appserv-tests/devtests/security/sful/shopping/ShoppingCartRemote.java
@@ -21,7 +21,7 @@
*/
package shopping;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
/**
* Shopping Cart Stateful Session Bean. Just tests -Dj2eelogin.name
* -Dj2eelogin.password system properties.
diff --git a/appserver/tests/appserv-tests/devtests/security/simple-perf/ejb/ConverterBean.java b/appserver/tests/appserv-tests/devtests/security/simple-perf/ejb/ConverterBean.java
index 3435f84..02783e4 100644
--- a/appserver/tests/appserv-tests/devtests/security/simple-perf/ejb/ConverterBean.java
+++ b/appserver/tests/appserv-tests/devtests/security/simple-perf/ejb/ConverterBean.java
@@ -17,8 +17,8 @@
package com.sun.s1peqe.security.ssl.converter.ejb;
import java.rmi.RemoteException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
import java.math.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/security/simple-perf/ejb/ConverterRemote.java b/appserver/tests/appserv-tests/devtests/security/simple-perf/ejb/ConverterRemote.java
index 65a717d..30be995 100644
--- a/appserver/tests/appserv-tests/devtests/security/simple-perf/ejb/ConverterRemote.java
+++ b/appserver/tests/appserv-tests/devtests/security/simple-perf/ejb/ConverterRemote.java
@@ -16,7 +16,7 @@
package com.sun.s1peqe.security.ssl.converter.ejb;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
import java.rmi.RemoteException;
import java.math.*;
diff --git a/appserver/tests/appserv-tests/devtests/security/simple-perf/ejb/ConverterRemoteHome.java b/appserver/tests/appserv-tests/devtests/security/simple-perf/ejb/ConverterRemoteHome.java
index 57b5a98..bf2a631 100644
--- a/appserver/tests/appserv-tests/devtests/security/simple-perf/ejb/ConverterRemoteHome.java
+++ b/appserver/tests/appserv-tests/devtests/security/simple-perf/ejb/ConverterRemoteHome.java
@@ -18,8 +18,8 @@
import java.io.Serializable;
import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBHome;
/**
* Home interface for the <code>ConverterBean</code>. Clients generally use home interface
diff --git a/appserver/tests/appserv-tests/devtests/security/simpleMultiRoleMapping/ejb/MessageBean.java b/appserver/tests/appserv-tests/devtests/security/simpleMultiRoleMapping/ejb/MessageBean.java
index 6af8c8e..2cb9766 100644
--- a/appserver/tests/appserv-tests/devtests/security/simpleMultiRoleMapping/ejb/MessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/security/simpleMultiRoleMapping/ejb/MessageBean.java
@@ -17,8 +17,8 @@
package com.sun.s1asdev.security.simpleMultiRoleMapping.ejb;
import jakarta.annotation.security.RolesAllowed;
-import javax.ejb.Local;
-import javax.ejb.Stateless;
+import jakarta.ejb.Local;
+import jakarta.ejb.Stateless;
@Stateless
@Local({MessageLocal.class})
diff --git a/appserver/tests/appserv-tests/devtests/security/simpleMultiRoleMapping/ejb/MessageLocal.java b/appserver/tests/appserv-tests/devtests/security/simpleMultiRoleMapping/ejb/MessageLocal.java
index 2823923..b8546a1 100644
--- a/appserver/tests/appserv-tests/devtests/security/simpleMultiRoleMapping/ejb/MessageLocal.java
+++ b/appserver/tests/appserv-tests/devtests/security/simpleMultiRoleMapping/ejb/MessageLocal.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.security.simpleMultiRoleMapping.ejb;
-import javax.ejb.Local;
+import jakarta.ejb.Local;
/**
* This is the business interface for Message enterprise bean.
diff --git a/appserver/tests/appserv-tests/devtests/security/simpleMultiRoleMapping/web/EjbTest.java b/appserver/tests/appserv-tests/devtests/security/simpleMultiRoleMapping/web/EjbTest.java
index 37269f5..3285836 100644
--- a/appserver/tests/appserv-tests/devtests/security/simpleMultiRoleMapping/web/EjbTest.java
+++ b/appserver/tests/appserv-tests/devtests/security/simpleMultiRoleMapping/web/EjbTest.java
@@ -19,7 +19,7 @@
import com.sun.s1asdev.security.simpleMultiRoleMapping.ejb.MessageLocal;
import java.io.*;
import java.net.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import javax.servlet.*;
import javax.servlet.http.*;
diff --git a/appserver/tests/appserv-tests/devtests/security/solarisRealm/client/RpaClient.java b/appserver/tests/appserv-tests/devtests/security/solarisRealm/client/RpaClient.java
index 7d2831b..42bc50d 100644
--- a/appserver/tests/appserv-tests/devtests/security/solarisRealm/client/RpaClient.java
+++ b/appserver/tests/appserv-tests/devtests/security/solarisRealm/client/RpaClient.java
@@ -18,7 +18,7 @@
import java.io.*;
import java.util.*;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
import javax.naming.*;
import javax.rmi.PortableRemoteObject;
import org.omg.CORBA.ORB;
diff --git a/appserver/tests/appserv-tests/devtests/security/solarisRealm/shopping/RpaBean.java b/appserver/tests/appserv-tests/devtests/security/solarisRealm/shopping/RpaBean.java
index cec09e4..405f369 100644
--- a/appserver/tests/appserv-tests/devtests/security/solarisRealm/shopping/RpaBean.java
+++ b/appserver/tests/appserv-tests/devtests/security/solarisRealm/shopping/RpaBean.java
@@ -22,12 +22,12 @@
package shopping;
-import javax.ejb.SessionContext;
-import javax.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.SessionBean;
import java.util.Vector;
import java.lang.String;
import java.util.Iterator;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJBException;
import java.rmi.RemoteException;
/**
*
@@ -115,7 +115,7 @@
}
- public void setSessionContext(javax.ejb.SessionContext sessionContext) {
+ public void setSessionContext(jakarta.ejb.SessionContext sessionContext) {
sc = sessionContext;
}
diff --git a/appserver/tests/appserv-tests/devtests/security/solarisRealm/shopping/RpaHome.java b/appserver/tests/appserv-tests/devtests/security/solarisRealm/shopping/RpaHome.java
index e52095e..d4262d0 100644
--- a/appserver/tests/appserv-tests/devtests/security/solarisRealm/shopping/RpaHome.java
+++ b/appserver/tests/appserv-tests/devtests/security/solarisRealm/shopping/RpaHome.java
@@ -21,7 +21,7 @@
*/
package shopping;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
import shopping.RpaRemote;
/**
*
@@ -30,6 +30,6 @@
public interface RpaHome extends EJBHome{
public RpaRemote create(java.lang.String shopperName)
- throws java.rmi.RemoteException, javax.ejb.CreateException;
+ throws java.rmi.RemoteException, jakarta.ejb.CreateException;
}
diff --git a/appserver/tests/appserv-tests/devtests/security/solarisRealm/shopping/RpaRemote.java b/appserver/tests/appserv-tests/devtests/security/solarisRealm/shopping/RpaRemote.java
index d5b1bb9..fb8a773 100644
--- a/appserver/tests/appserv-tests/devtests/security/solarisRealm/shopping/RpaRemote.java
+++ b/appserver/tests/appserv-tests/devtests/security/solarisRealm/shopping/RpaRemote.java
@@ -21,7 +21,7 @@
*/
package shopping;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
/**
* Shopping Cart Stateful Session Bean. Just tests -Dj2eelogin.name
* -Dj2eelogin.password system properties.
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/LdapSetup.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/LdapSetup.java
index 91042e9..4868ae2 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/LdapSetup.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/LdapSetup.java
@@ -24,8 +24,8 @@
import jakarta.annotation.PostConstruct;
import jakarta.annotation.PreDestroy;
-import javax.ejb.Singleton;
-import javax.ejb.Startup;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup;
/**
* Starts up the embedded Unboundid LDAP server on port 33389 and loads a test directory
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/DatabaseSetup.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/DatabaseSetup.java
index 4420109..d5b7153 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/DatabaseSetup.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/DatabaseSetup.java
@@ -24,8 +24,8 @@
import jakarta.annotation.PreDestroy;
import jakarta.annotation.Resource;
import jakarta.annotation.sql.DataSourceDefinition;
-import javax.ejb.Singleton;
-import javax.ejb.Startup;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup;
import javax.sql.DataSource;
@Singleton
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/src/main/java/org/glassfish/soteria/test/Servlet.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/src/main/java/org/glassfish/soteria/test/Servlet.java
index 67f269e..5bb66a0 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/src/main/java/org/glassfish/soteria/test/Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/src/main/java/org/glassfish/soteria/test/Servlet.java
@@ -19,7 +19,7 @@
import org.glassfish.soteria.SecurityContextImpl;
import jakarta.annotation.security.DeclareRoles;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import javax.security.enterprise.AuthenticationStatus;
import javax.security.enterprise.SecurityContext;
import javax.security.enterprise.credential.CallerOnlyCredential;
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/src/main/java/org/glassfish/soteria/test/TestEJB.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/src/main/java/org/glassfish/soteria/test/TestEJB.java
index 1895443..9f103dd 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/src/main/java/org/glassfish/soteria/test/TestEJB.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/src/main/java/org/glassfish/soteria/test/TestEJB.java
@@ -16,12 +16,12 @@
package org.glassfish.soteria.test;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import javax.inject.Inject;
import jakarta.annotation.security.DeclareRoles;
import jakarta.annotation.security.PermitAll;
import jakarta.annotation.Resource;
-import javax.ejb.EJBContext;
+import jakarta.ejb.EJBContext;
import jakarta.annotation.security.RolesAllowed;
import org.glassfish.soteria.SecurityContextImpl;
import javax.security.enterprise.SecurityContext;
diff --git a/appserver/tests/appserv-tests/devtests/security/standalone/loginctxdriver/client/LoginContextDriverTest.java b/appserver/tests/appserv-tests/devtests/security/standalone/loginctxdriver/client/LoginContextDriverTest.java
index f9cde7f..7381bdf 100644
--- a/appserver/tests/appserv-tests/devtests/security/standalone/loginctxdriver/client/LoginContextDriverTest.java
+++ b/appserver/tests/appserv-tests/devtests/security/standalone/loginctxdriver/client/LoginContextDriverTest.java
@@ -19,7 +19,7 @@
import java.util.Properties;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
diff --git a/appserver/tests/appserv-tests/devtests/security/standalone/loginctxdriver/ejb/MySession1Bean.java b/appserver/tests/appserv-tests/devtests/security/standalone/loginctxdriver/ejb/MySession1Bean.java
index b614211..556cacd 100644
--- a/appserver/tests/appserv-tests/devtests/security/standalone/loginctxdriver/ejb/MySession1Bean.java
+++ b/appserver/tests/appserv-tests/devtests/security/standalone/loginctxdriver/ejb/MySession1Bean.java
@@ -14,7 +14,7 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/
-import javax.ejb.*;
+import jakarta.ejb.*;
/**
* This is the bean class for the MySession1Bean enterprise bean.
@@ -23,28 +23,28 @@
private SessionContext context;
/**
- * @see javax.ejb.SessionBean#setSessionContext(javax.ejb.SessionContext)
+ * @see jakarta.ejb.SessionBean#setSessionContext(jakarta.ejb.SessionContext)
*/
public void setSessionContext(SessionContext aContext) {
context = aContext;
}
/**
- * @see javax.ejb.SessionBean#ejbActivate()
+ * @see jakarta.ejb.SessionBean#ejbActivate()
*/
public void ejbActivate() {
}
/**
- * @see javax.ejb.SessionBean#ejbPassivate()
+ * @see jakarta.ejb.SessionBean#ejbPassivate()
*/
public void ejbPassivate() {
}
/**
- * @see javax.ejb.SessionBean#ejbRemove()
+ * @see jakarta.ejb.SessionBean#ejbRemove()
*/
public void ejbRemove() {
diff --git a/appserver/tests/appserv-tests/devtests/security/standalone/loginctxdriver/ejb/MySession1Remote.java b/appserver/tests/appserv-tests/devtests/security/standalone/loginctxdriver/ejb/MySession1Remote.java
index 57f82ec..798d406 100644
--- a/appserver/tests/appserv-tests/devtests/security/standalone/loginctxdriver/ejb/MySession1Remote.java
+++ b/appserver/tests/appserv-tests/devtests/security/standalone/loginctxdriver/ejb/MySession1Remote.java
@@ -14,7 +14,7 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
/**
diff --git a/appserver/tests/appserv-tests/devtests/security/standalone/loginctxdriver/ejb/MySession1RemoteHome.java b/appserver/tests/appserv-tests/devtests/security/standalone/loginctxdriver/ejb/MySession1RemoteHome.java
index daada77..7ebc8f0 100644
--- a/appserver/tests/appserv-tests/devtests/security/standalone/loginctxdriver/ejb/MySession1RemoteHome.java
+++ b/appserver/tests/appserv-tests/devtests/security/standalone/loginctxdriver/ejb/MySession1RemoteHome.java
@@ -15,8 +15,8 @@
*/
import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBHome;
/**
diff --git a/appserver/tests/appserv-tests/devtests/security/timerStandalone/client/Client.java b/appserver/tests/appserv-tests/devtests/security/timerStandalone/client/Client.java
index 89f0aa2..b0c3727 100644
--- a/appserver/tests/appserv-tests/devtests/security/timerStandalone/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/security/timerStandalone/client/Client.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.security.timerStandalone.client;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import com.sun.s1asdev.security.timerStandalone.*;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
diff --git a/appserver/tests/appserv-tests/devtests/security/timerStandalone/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/security/timerStandalone/ejb/SfulEJB.java
index ac1d846..9245d21 100644
--- a/appserver/tests/appserv-tests/devtests/security/timerStandalone/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/security/timerStandalone/ejb/SfulEJB.java
@@ -16,8 +16,8 @@
package com.sun.s1asdev.security.timerStandalone;
-import javax.ejb.Stateful;
-import javax.ejb.Remote;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.Remote;
@Stateful
@Remote({Sful.class})
diff --git a/appserver/tests/appserv-tests/devtests/security/timerStandalone/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/security/timerStandalone/ejb/SlessEJB.java
index eaf5771..e6b0801 100644
--- a/appserver/tests/appserv-tests/devtests/security/timerStandalone/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/security/timerStandalone/ejb/SlessEJB.java
@@ -20,12 +20,12 @@
import jakarta.annotation.security.DeclareRoles;
import jakarta.annotation.security.RolesAllowed;
import jakarta.annotation.security.RunAs;
-import javax.ejb.Remote;
-import javax.ejb.SessionContext;
-import javax.ejb.Stateless;
-import javax.ejb.Timeout;
-import javax.ejb.Timer;
-import javax.ejb.TimerService;
+import jakarta.ejb.Remote;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.Timeout;
+import jakarta.ejb.Timer;
+import jakarta.ejb.TimerService;
@Stateless
@Remote({Sless.class})
diff --git a/appserver/tests/appserv-tests/devtests/security/userWithAtSymbol/client/RpaClient.java b/appserver/tests/appserv-tests/devtests/security/userWithAtSymbol/client/RpaClient.java
index 1cf5f16..2ffc42a 100644
--- a/appserver/tests/appserv-tests/devtests/security/userWithAtSymbol/client/RpaClient.java
+++ b/appserver/tests/appserv-tests/devtests/security/userWithAtSymbol/client/RpaClient.java
@@ -18,7 +18,7 @@
import java.io.*;
import java.util.*;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
import javax.naming.*;
import javax.rmi.PortableRemoteObject;
import org.omg.CORBA.ORB;
diff --git a/appserver/tests/appserv-tests/devtests/security/userWithAtSymbol/shopping/RpaBean.java b/appserver/tests/appserv-tests/devtests/security/userWithAtSymbol/shopping/RpaBean.java
index 3489659..4b53bd4 100644
--- a/appserver/tests/appserv-tests/devtests/security/userWithAtSymbol/shopping/RpaBean.java
+++ b/appserver/tests/appserv-tests/devtests/security/userWithAtSymbol/shopping/RpaBean.java
@@ -22,12 +22,12 @@
package shopping;
-import javax.ejb.SessionContext;
-import javax.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.SessionBean;
import java.util.Vector;
import java.lang.String;
import java.util.Iterator;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJBException;
import java.rmi.RemoteException;
/**
*
@@ -114,7 +114,7 @@
}
- public void setSessionContext(javax.ejb.SessionContext sessionContext) {
+ public void setSessionContext(jakarta.ejb.SessionContext sessionContext) {
sc = sessionContext;
}
diff --git a/appserver/tests/appserv-tests/devtests/security/userWithAtSymbol/shopping/RpaHome.java b/appserver/tests/appserv-tests/devtests/security/userWithAtSymbol/shopping/RpaHome.java
index e52095e..d4262d0 100644
--- a/appserver/tests/appserv-tests/devtests/security/userWithAtSymbol/shopping/RpaHome.java
+++ b/appserver/tests/appserv-tests/devtests/security/userWithAtSymbol/shopping/RpaHome.java
@@ -21,7 +21,7 @@
*/
package shopping;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
import shopping.RpaRemote;
/**
*
@@ -30,6 +30,6 @@
public interface RpaHome extends EJBHome{
public RpaRemote create(java.lang.String shopperName)
- throws java.rmi.RemoteException, javax.ejb.CreateException;
+ throws java.rmi.RemoteException, jakarta.ejb.CreateException;
}
diff --git a/appserver/tests/appserv-tests/devtests/security/userWithAtSymbol/shopping/RpaRemote.java b/appserver/tests/appserv-tests/devtests/security/userWithAtSymbol/shopping/RpaRemote.java
index d5b1bb9..fb8a773 100644
--- a/appserver/tests/appserv-tests/devtests/security/userWithAtSymbol/shopping/RpaRemote.java
+++ b/appserver/tests/appserv-tests/devtests/security/userWithAtSymbol/shopping/RpaRemote.java
@@ -21,7 +21,7 @@
*/
package shopping;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
/**
* Shopping Cart Stateful Session Bean. Just tests -Dj2eelogin.name
* -Dj2eelogin.password system properties.
diff --git a/appserver/tests/appserv-tests/devtests/security/wss/gartner/build.xml b/appserver/tests/appserv-tests/devtests/security/wss/gartner/build.xml
index 38a459d..38a896d 100644
--- a/appserver/tests/appserv-tests/devtests/security/wss/gartner/build.xml
+++ b/appserver/tests/appserv-tests/devtests/security/wss/gartner/build.xml
@@ -60,7 +60,7 @@
<mkdir dir="${build.classes.dir}/client/META-INF/wsdl"/>
<antcall target="wsgen">
<param name="wsgen.args"
- value="-wsdl -cp ${build.classes.dir}/ejbws:${s1astest.classpath}/modules/javax.ejb.jar -keep -d ${build.classes.dir}/ejbws com.sun.s1asdev.security.wss.gartner.PingEjb"/>
+ value="-wsdl -cp ${build.classes.dir}/ejbws:${s1astest.classpath}/modules/jakarta.ejb.jar -keep -d ${build.classes.dir}/ejbws com.sun.s1asdev.security.wss.gartner.PingEjb"/>
</antcall>
<antcall target="wsgen">
diff --git a/appserver/tests/appserv-tests/devtests/security/wss/gartner/ejbws/PingEjb.java b/appserver/tests/appserv-tests/devtests/security/wss/gartner/ejbws/PingEjb.java
index f4d8871..5e1de6e 100644
--- a/appserver/tests/appserv-tests/devtests/security/wss/gartner/ejbws/PingEjb.java
+++ b/appserver/tests/appserv-tests/devtests/security/wss/gartner/ejbws/PingEjb.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.security.wss.gartner;
import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
@Stateless
@WebService(targetNamespace="http://gartner.wss.security.s1asdev.sun.com")
diff --git a/appserver/tests/appserv-tests/devtests/security/wss/roles/ejbws/HelloEjb.java b/appserver/tests/appserv-tests/devtests/security/wss/roles/ejbws/HelloEjb.java
index 36b006d..99ce593 100644
--- a/appserver/tests/appserv-tests/devtests/security/wss/roles/ejbws/HelloEjb.java
+++ b/appserver/tests/appserv-tests/devtests/security/wss/roles/ejbws/HelloEjb.java
@@ -22,9 +22,9 @@
import jakarta.annotation.security.PermitAll;
import jakarta.annotation.security.RolesAllowed;
import jakarta.annotation.security.RunAs;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.ejb.SessionContext;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.SessionContext;
import jakarta.jws.WebService;
import jakarta.xml.ws.WebServiceContext;
diff --git a/appserver/tests/appserv-tests/devtests/security/wss/roles/ejbws/SfulEJB.java b/appserver/tests/appserv-tests/devtests/security/wss/roles/ejbws/SfulEJB.java
index d068bec..1c98945 100644
--- a/appserver/tests/appserv-tests/devtests/security/wss/roles/ejbws/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/security/wss/roles/ejbws/SfulEJB.java
@@ -17,8 +17,8 @@
package com.sun.s1asdev.security.wss.roles.ejb;
import jakarta.annotation.security.RolesAllowed;
-import javax.ejb.Local;
-import javax.ejb.Stateful;
+import jakarta.ejb.Local;
+import jakarta.ejb.Stateful;
@Stateful
@Local({SfulLocal.class})
diff --git a/appserver/tests/appserv-tests/devtests/security/wss/roles/ejbws2/HelloEjb2.java b/appserver/tests/appserv-tests/devtests/security/wss/roles/ejbws2/HelloEjb2.java
index f5b18eb..ba06231 100644
--- a/appserver/tests/appserv-tests/devtests/security/wss/roles/ejbws2/HelloEjb2.java
+++ b/appserver/tests/appserv-tests/devtests/security/wss/roles/ejbws2/HelloEjb2.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.security.wss.roles.ejbws2;
import jakarta.annotation.security.RolesAllowed;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import jakarta.jws.WebService;
@Stateless
diff --git a/appserver/tests/appserv-tests/devtests/security/wss/roles2/ejbws/HelloEjb.java b/appserver/tests/appserv-tests/devtests/security/wss/roles2/ejbws/HelloEjb.java
index 39b984e..c67cc18 100644
--- a/appserver/tests/appserv-tests/devtests/security/wss/roles2/ejbws/HelloEjb.java
+++ b/appserver/tests/appserv-tests/devtests/security/wss/roles2/ejbws/HelloEjb.java
@@ -22,9 +22,9 @@
import jakarta.annotation.security.PermitAll;
import jakarta.annotation.security.RolesAllowed;
import jakarta.annotation.security.RunAs;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.ejb.SessionContext;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.SessionContext;
import jakarta.jws.WebService;
import com.sun.s1asdev.security.wss.roles2.ejb.SfulLocal;
diff --git a/appserver/tests/appserv-tests/devtests/security/wss/roles2/ejbws/SfulEJB.java b/appserver/tests/appserv-tests/devtests/security/wss/roles2/ejbws/SfulEJB.java
index 614e9d0..c13f90b 100644
--- a/appserver/tests/appserv-tests/devtests/security/wss/roles2/ejbws/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/security/wss/roles2/ejbws/SfulEJB.java
@@ -18,9 +18,9 @@
import jakarta.annotation.security.RolesAllowed;
import jakarta.annotation.security.RunAs;
-import javax.ejb.EJB;
-import javax.ejb.Local;
-import javax.ejb.Stateful;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Local;
+import jakarta.ejb.Stateful;
@Stateful
@Local({SfulLocal.class})
diff --git a/appserver/tests/appserv-tests/devtests/security/wss/roles2/ejbws/SlessEJB.java b/appserver/tests/appserv-tests/devtests/security/wss/roles2/ejbws/SlessEJB.java
index 0c46713..debfd65 100644
--- a/appserver/tests/appserv-tests/devtests/security/wss/roles2/ejbws/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/security/wss/roles2/ejbws/SlessEJB.java
@@ -17,8 +17,8 @@
package com.sun.s1asdev.security.wss.roles2.ejb;
import jakarta.annotation.security.RolesAllowed;
-import javax.ejb.Local;
-import javax.ejb.Stateless;
+import jakarta.ejb.Local;
+import jakarta.ejb.Stateless;
@Stateless
@Local({SlessLocal.class})
diff --git a/appserver/tests/appserv-tests/devtests/security/wss/ssl/ejbws/HelloEjb.java b/appserver/tests/appserv-tests/devtests/security/wss/ssl/ejbws/HelloEjb.java
index dad4f2b..8d14ac3 100644
--- a/appserver/tests/appserv-tests/devtests/security/wss/ssl/ejbws/HelloEjb.java
+++ b/appserver/tests/appserv-tests/devtests/security/wss/ssl/ejbws/HelloEjb.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.security.wss.ssl.ejbws;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import jakarta.jws.WebService;
@Stateless
diff --git a/appserver/tests/appserv-tests/devtests/security/wss/sslclientcert/ejbws/HelloEjb.java b/appserver/tests/appserv-tests/devtests/security/wss/sslclientcert/ejbws/HelloEjb.java
index 485a3ae..838e372 100644
--- a/appserver/tests/appserv-tests/devtests/security/wss/sslclientcert/ejbws/HelloEjb.java
+++ b/appserver/tests/appserv-tests/devtests/security/wss/sslclientcert/ejbws/HelloEjb.java
@@ -17,8 +17,8 @@
package com.sun.s1asdev.security.wss.sslclientcert.ejbws;
import jakarta.annotation.Resource;
-import javax.ejb.SessionContext;
-import javax.ejb.Stateless;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.Stateless;
import jakarta.jws.WebService;
import jakarta.xml.ws.WebServiceContext;
diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/autorecovery/war/MyBean.java b/appserver/tests/appserv-tests/devtests/transaction/ee/autorecovery/war/MyBean.java
index fc7533c..d50f324 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/autorecovery/war/MyBean.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/autorecovery/war/MyBean.java
@@ -22,7 +22,7 @@
package com.acme;
import java.sql.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.sql.DataSource;
import javax.naming.InitialContext;
diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/autorecovery/war/TestServlet.java b/appserver/tests/appserv-tests/devtests/transaction/ee/autorecovery/war/TestServlet.java
index bc79260..d5e68a2 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/autorecovery/war/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/autorecovery/war/TestServlet.java
@@ -16,8 +16,8 @@
package com.acme;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
import java.io.IOException;
import java.io.PrintWriter;
import java.sql.Connection;
diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/autorecovery/war/VerifyServlet.java b/appserver/tests/appserv-tests/devtests/transaction/ee/autorecovery/war/VerifyServlet.java
index 9c530f8..51a5d96 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/autorecovery/war/VerifyServlet.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/autorecovery/war/VerifyServlet.java
@@ -16,8 +16,8 @@
package com.acme;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
import java.io.IOException;
import java.io.PrintWriter;
import java.sql.Connection;
diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/cli/war/MyBean.java b/appserver/tests/appserv-tests/devtests/transaction/ee/cli/war/MyBean.java
index 6c6036a..d7ad602 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/cli/war/MyBean.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/cli/war/MyBean.java
@@ -22,7 +22,7 @@
package com.acme;
import java.sql.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.sql.DataSource;
import javax.naming.InitialContext;
diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/cli/war/TestServlet.java b/appserver/tests/appserv-tests/devtests/transaction/ee/cli/war/TestServlet.java
index bc79260..d5e68a2 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/cli/war/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/cli/war/TestServlet.java
@@ -16,8 +16,8 @@
package com.acme;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
import java.io.IOException;
import java.io.PrintWriter;
import java.sql.Connection;
diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/cli/war/VerifyServlet.java b/appserver/tests/appserv-tests/devtests/transaction/ee/cli/war/VerifyServlet.java
index 9c530f8..51a5d96 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/cli/war/VerifyServlet.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/cli/war/VerifyServlet.java
@@ -16,8 +16,8 @@
package com.acme;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
import java.io.IOException;
import java.io.PrintWriter;
import java.sql.Connection;
diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/base/war/MyBean.java b/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/base/war/MyBean.java
index fc7533c..d50f324 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/base/war/MyBean.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/base/war/MyBean.java
@@ -22,7 +22,7 @@
package com.acme;
import java.sql.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.sql.DataSource;
import javax.naming.InitialContext;
diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/base/war/TestServlet.java b/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/base/war/TestServlet.java
index bc79260..d5e68a2 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/base/war/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/base/war/TestServlet.java
@@ -16,8 +16,8 @@
package com.acme;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
import java.io.IOException;
import java.io.PrintWriter;
import java.sql.Connection;
diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/base/war/VerifyServlet.java b/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/base/war/VerifyServlet.java
index 9c530f8..51a5d96 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/base/war/VerifyServlet.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/base/war/VerifyServlet.java
@@ -16,8 +16,8 @@
package com.acme;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
import java.io.IOException;
import java.io.PrintWriter;
import java.sql.Connection;
diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/war/MdBean.java b/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/war/MdBean.java
index 22d28b7..e64fa49 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/war/MdBean.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/war/MdBean.java
@@ -21,7 +21,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/war/MyBean.java b/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/war/MyBean.java
index 9a29a24..949ac53 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/war/MyBean.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/war/MyBean.java
@@ -22,7 +22,7 @@
package com.acme;
import java.sql.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.jms.*;
import javax.sql.DataSource;
import javax.naming.InitialContext;
diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/war/TestServlet.java b/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/war/TestServlet.java
index 115aaff..1ec9fac 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/war/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/war/TestServlet.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import java.io.IOException;
import java.io.PrintWriter;
import javax.servlet.ServletConfig;
diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/war/VerifyServlet.java b/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/war/VerifyServlet.java
index d010c36..06e5f2e 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/war/VerifyServlet.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/war/VerifyServlet.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import java.io.IOException;
import java.io.PrintWriter;
import javax.servlet.ServletConfig;
diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/mdb/war/MdBean.java b/appserver/tests/appserv-tests/devtests/transaction/ee/mdb/war/MdBean.java
index 22d28b7..e64fa49 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/mdb/war/MdBean.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/mdb/war/MdBean.java
@@ -21,7 +21,7 @@
package com.acme;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/mdb/war/MyBean.java b/appserver/tests/appserv-tests/devtests/transaction/ee/mdb/war/MyBean.java
index 0736479..d47f6c0 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/mdb/war/MyBean.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/mdb/war/MyBean.java
@@ -22,7 +22,7 @@
package com.acme;
import java.sql.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import jakarta.jms.*;
import javax.sql.DataSource;
import javax.naming.InitialContext;
diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/mdb/war/TestServlet.java b/appserver/tests/appserv-tests/devtests/transaction/ee/mdb/war/TestServlet.java
index 66c820a..5addeb8 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/mdb/war/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/mdb/war/TestServlet.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import java.io.IOException;
import java.io.PrintWriter;
import javax.servlet.ServletConfig;
diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/mdb/war/VerifyServlet.java b/appserver/tests/appserv-tests/devtests/transaction/ee/mdb/war/VerifyServlet.java
index d010c36..06e5f2e 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/mdb/war/VerifyServlet.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/mdb/war/VerifyServlet.java
@@ -16,7 +16,7 @@
package com.acme;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import java.io.IOException;
import java.io.PrintWriter;
import javax.servlet.ServletConfig;
diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/resendautorecovery/war/MyBean.java b/appserver/tests/appserv-tests/devtests/transaction/ee/resendautorecovery/war/MyBean.java
index ac10596..f95bab7 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/resendautorecovery/war/MyBean.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/resendautorecovery/war/MyBean.java
@@ -22,7 +22,7 @@
package com.acme;
import java.sql.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.sql.DataSource;
import javax.naming.InitialContext;
diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/resendautorecovery/war/TestServlet.java b/appserver/tests/appserv-tests/devtests/transaction/ee/resendautorecovery/war/TestServlet.java
index 85a018a..d46371f 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/resendautorecovery/war/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/resendautorecovery/war/TestServlet.java
@@ -16,8 +16,8 @@
package com.acme;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
import java.io.IOException;
import java.io.PrintWriter;
import java.sql.Connection;
diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/resendautorecovery/war/VerifyServlet.java b/appserver/tests/appserv-tests/devtests/transaction/ee/resendautorecovery/war/VerifyServlet.java
index 9c530f8..51a5d96 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/resendautorecovery/war/VerifyServlet.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/resendautorecovery/war/VerifyServlet.java
@@ -16,8 +16,8 @@
package com.acme;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
import java.io.IOException;
import java.io.PrintWriter;
import java.sql.Connection;
diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/selfrecovery/war/MyBean.java b/appserver/tests/appserv-tests/devtests/transaction/ee/selfrecovery/war/MyBean.java
index fc7533c..d50f324 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/selfrecovery/war/MyBean.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/selfrecovery/war/MyBean.java
@@ -22,7 +22,7 @@
package com.acme;
import java.sql.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.sql.DataSource;
import javax.naming.InitialContext;
diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/selfrecovery/war/TestServlet.java b/appserver/tests/appserv-tests/devtests/transaction/ee/selfrecovery/war/TestServlet.java
index bc79260..d5e68a2 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/selfrecovery/war/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/selfrecovery/war/TestServlet.java
@@ -16,8 +16,8 @@
package com.acme;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
import java.io.IOException;
import java.io.PrintWriter;
import java.sql.Connection;
diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/selfrecovery/war/VerifyServlet.java b/appserver/tests/appserv-tests/devtests/transaction/ee/selfrecovery/war/VerifyServlet.java
index 9c530f8..51a5d96 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/selfrecovery/war/VerifyServlet.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/selfrecovery/war/VerifyServlet.java
@@ -16,8 +16,8 @@
package com.acme;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
import java.io.IOException;
import java.io.PrintWriter;
import java.sql.Connection;
diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/timer_with_autorecovery/war/MyBean.java b/appserver/tests/appserv-tests/devtests/transaction/ee/timer_with_autorecovery/war/MyBean.java
index fa82fae..462d545 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/timer_with_autorecovery/war/MyBean.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/timer_with_autorecovery/war/MyBean.java
@@ -22,7 +22,7 @@
package com.acme;
import java.sql.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.sql.DataSource;
import javax.naming.InitialContext;
import jakarta.annotation.Resource;
diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/timer_with_autorecovery/war/TestServlet.java b/appserver/tests/appserv-tests/devtests/transaction/ee/timer_with_autorecovery/war/TestServlet.java
index 0e8c714..aaa4330 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/timer_with_autorecovery/war/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/timer_with_autorecovery/war/TestServlet.java
@@ -16,8 +16,8 @@
package com.acme;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
import java.io.IOException;
import java.io.PrintWriter;
import java.sql.Connection;
diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/timer_with_autorecovery/war/VerifyServlet.java b/appserver/tests/appserv-tests/devtests/transaction/ee/timer_with_autorecovery/war/VerifyServlet.java
index 9c530f8..51a5d96 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/timer_with_autorecovery/war/VerifyServlet.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/timer_with_autorecovery/war/VerifyServlet.java
@@ -16,8 +16,8 @@
package com.acme;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
import java.io.IOException;
import java.io.PrintWriter;
import java.sql.Connection;
diff --git a/appserver/tests/appserv-tests/devtests/transaction/twopcreadonly/ejb/beanB/TxBeanB.java b/appserver/tests/appserv-tests/devtests/transaction/twopcreadonly/ejb/beanB/TxBeanB.java
index 6ef8b73..58273c2 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/twopcreadonly/ejb/beanB/TxBeanB.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/twopcreadonly/ejb/beanB/TxBeanB.java
@@ -16,10 +16,10 @@
package com.sun.s1peqe.transaction.txglobal.ejb.beanB;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.SessionSynchronization;
-import javax.ejb.*;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.SessionSynchronization;
+import jakarta.ejb.*;
import java.sql.Statement;
import java.sql.ResultSet;
diff --git a/appserver/tests/appserv-tests/devtests/transaction/twopcreadonly/ejb/beanB/TxRemoteB.java b/appserver/tests/appserv-tests/devtests/transaction/twopcreadonly/ejb/beanB/TxRemoteB.java
index af3b342..22d1bfa 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/twopcreadonly/ejb/beanB/TxRemoteB.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/twopcreadonly/ejb/beanB/TxRemoteB.java
@@ -16,7 +16,7 @@
package com.sun.s1peqe.transaction.txglobal.ejb.beanB;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
import java.rmi.RemoteException;
public interface TxRemoteB extends EJBObject{
diff --git a/appserver/tests/appserv-tests/devtests/transaction/twopcreadonly/ejb/beanB/TxRemoteHomeB.java b/appserver/tests/appserv-tests/devtests/transaction/twopcreadonly/ejb/beanB/TxRemoteHomeB.java
index 76b956b..106ebd3 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/twopcreadonly/ejb/beanB/TxRemoteHomeB.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/twopcreadonly/ejb/beanB/TxRemoteHomeB.java
@@ -16,9 +16,9 @@
package com.sun.s1peqe.transaction.txglobal.ejb.beanB;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
import java.rmi.RemoteException;
-import javax.ejb.CreateException;
+import jakarta.ejb.CreateException;
public interface TxRemoteHomeB extends EJBHome {
public TxRemoteB create() throws RemoteException, CreateException;
diff --git a/appserver/tests/appserv-tests/devtests/transaction/txhung/client/Client.java b/appserver/tests/appserv-tests/devtests/transaction/txhung/client/Client.java
index 09ba49c..a9f38b2 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/txhung/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/txhung/client/Client.java
@@ -60,7 +60,7 @@
try {
result = t.testA1(xa);
System.out.println("TEST FAILED");
- } catch (javax.ejb.CreateException e) {
+ } catch (jakarta.ejb.CreateException e) {
System.out.println("CreateException");
System.out.println("TEST FAILED");
} catch (Exception e) {
@@ -77,7 +77,7 @@
try {
result = t.testA1(nonxa);
System.out.println("TEST FAILED");
- } catch (javax.ejb.CreateException e) {
+ } catch (jakarta.ejb.CreateException e) {
System.out.println("CreateException");
System.out.println("TEST FAILED");
} catch (Exception e) {
diff --git a/appserver/tests/appserv-tests/devtests/transaction/txhung/ejb/test/TestBean.java b/appserver/tests/appserv-tests/devtests/transaction/txhung/ejb/test/TestBean.java
index efac3e6..9fc0273 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/txhung/ejb/test/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/txhung/ejb/test/TestBean.java
@@ -16,9 +16,9 @@
package com.sun.s1peqe.transaction.txhung.ejb.test;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.naming.*;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionContext;
import java.sql.Statement;
import java.sql.ResultSet;
diff --git a/appserver/tests/appserv-tests/devtests/transaction/txhung/ejb/test/TestHome.java b/appserver/tests/appserv-tests/devtests/transaction/txhung/ejb/test/TestHome.java
index 6887fc2..a6a2dcb 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/txhung/ejb/test/TestHome.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/txhung/ejb/test/TestHome.java
@@ -16,7 +16,7 @@
package com.sun.s1peqe.transaction.txhung.ejb.test;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface TestHome extends EJBHome {
diff --git a/appserver/tests/appserv-tests/devtests/transaction/txhung/ejb/test/TestRemote.java b/appserver/tests/appserv-tests/devtests/transaction/txhung/ejb/test/TestRemote.java
index 9bd508c..228c1f4 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/txhung/ejb/test/TestRemote.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/txhung/ejb/test/TestRemote.java
@@ -16,7 +16,7 @@
package com.sun.s1peqe.transaction.txhung.ejb.test;
-import javax.ejb.*;
+import jakarta.ejb.*;
import java.rmi.*;
public interface TestRemote extends EJBObject {
diff --git a/appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanA/TxBeanA.java b/appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanA/TxBeanA.java
index 1f85144..f4d3366 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanA/TxBeanA.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanA/TxBeanA.java
@@ -16,8 +16,8 @@
package com.sun.s1peqe.transaction.txlao.ejb.beanA;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.rmi.PortableRemoteObject;
diff --git a/appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanA/TxRemoteA.java b/appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanA/TxRemoteA.java
index 8c8da72..5f455b3 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanA/TxRemoteA.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanA/TxRemoteA.java
@@ -16,7 +16,7 @@
package com.sun.s1peqe.transaction.txlao.ejb.beanA;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
import java.rmi.RemoteException;
public interface TxRemoteA extends EJBObject{
diff --git a/appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanA/TxRemoteHomeA.java b/appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanA/TxRemoteHomeA.java
index 06cadc8..8d85979 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanA/TxRemoteHomeA.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanA/TxRemoteHomeA.java
@@ -16,9 +16,9 @@
package com.sun.s1peqe.transaction.txlao.ejb.beanA;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
import java.rmi.RemoteException;
-import javax.ejb.CreateException;
+import jakarta.ejb.CreateException;
public interface TxRemoteHomeA extends EJBHome {
public TxRemoteA create() throws RemoteException, CreateException;
diff --git a/appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanB/TxBeanB.java b/appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanB/TxBeanB.java
index 8c00ea2..144447f 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanB/TxBeanB.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanB/TxBeanB.java
@@ -16,8 +16,8 @@
package com.sun.s1peqe.transaction.txlao.ejb.beanB;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
import java.sql.Statement;
import java.sql.ResultSet;
diff --git a/appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanB/TxRemoteB.java b/appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanB/TxRemoteB.java
index ad4543e..01e331d 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanB/TxRemoteB.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanB/TxRemoteB.java
@@ -16,7 +16,7 @@
package com.sun.s1peqe.transaction.txlao.ejb.beanB;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
import java.rmi.RemoteException;
public interface TxRemoteB extends EJBObject{
diff --git a/appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanB/TxRemoteHomeB.java b/appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanB/TxRemoteHomeB.java
index 77eab64..295ed0d 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanB/TxRemoteHomeB.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanB/TxRemoteHomeB.java
@@ -16,9 +16,9 @@
package com.sun.s1peqe.transaction.txlao.ejb.beanB;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
import java.rmi.RemoteException;
-import javax.ejb.CreateException;
+import jakarta.ejb.CreateException;
public interface TxRemoteHomeB extends EJBHome {
public TxRemoteB create() throws RemoteException, CreateException;
diff --git a/appserver/tests/appserv-tests/devtests/transaction/txnegative/client/Client.java b/appserver/tests/appserv-tests/devtests/transaction/txnegative/client/Client.java
index ffb8213..9469fdb 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/txnegative/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/txnegative/client/Client.java
@@ -67,7 +67,7 @@
try {
result = t.testA1(xa);
System.out.println("TEST FAILED");
- } catch (javax.ejb.CreateException e) {
+ } catch (jakarta.ejb.CreateException e) {
System.out.println("CreateException");
System.out.println("TEST FAILED");
} catch (Exception e) {
@@ -83,7 +83,7 @@
try {
result = t.testA1(nonxa);
System.out.println("TEST FAILED");
- } catch (javax.ejb.CreateException e) {
+ } catch (jakarta.ejb.CreateException e) {
System.out.println("CreateException");
System.out.println("TEST FAILED");
} catch (Exception e) {
diff --git a/appserver/tests/appserv-tests/devtests/transaction/txstress/ejb/beanA/TxBeanA.java b/appserver/tests/appserv-tests/devtests/transaction/txstress/ejb/beanA/TxBeanA.java
index b81405d..f3c6416 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/txstress/ejb/beanA/TxBeanA.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/txstress/ejb/beanA/TxBeanA.java
@@ -16,8 +16,8 @@
package com.sun.s1peqe.transaction.txstress.ejb.beanA;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.rmi.PortableRemoteObject;
diff --git a/appserver/tests/appserv-tests/devtests/transaction/txstress/ejb/beanA/TxRemoteA.java b/appserver/tests/appserv-tests/devtests/transaction/txstress/ejb/beanA/TxRemoteA.java
index ca444d5..abcfc44 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/txstress/ejb/beanA/TxRemoteA.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/txstress/ejb/beanA/TxRemoteA.java
@@ -16,7 +16,7 @@
package com.sun.s1peqe.transaction.txstress.ejb.beanA;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
import java.rmi.RemoteException;
public interface TxRemoteA extends EJBObject{
diff --git a/appserver/tests/appserv-tests/devtests/transaction/txstress/ejb/beanA/TxRemoteHomeA.java b/appserver/tests/appserv-tests/devtests/transaction/txstress/ejb/beanA/TxRemoteHomeA.java
index 2eafaa8..14eca7c 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/txstress/ejb/beanA/TxRemoteHomeA.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/txstress/ejb/beanA/TxRemoteHomeA.java
@@ -16,9 +16,9 @@
package com.sun.s1peqe.transaction.txstress.ejb.beanA;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
import java.rmi.RemoteException;
-import javax.ejb.CreateException;
+import jakarta.ejb.CreateException;
public interface TxRemoteHomeA extends EJBHome {
public TxRemoteA create() throws RemoteException, CreateException;
diff --git a/appserver/tests/appserv-tests/devtests/transaction/txstress/ejb/beanB/TxBeanB.java b/appserver/tests/appserv-tests/devtests/transaction/txstress/ejb/beanB/TxBeanB.java
index dbdbfba..2fefbf3 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/txstress/ejb/beanB/TxBeanB.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/txstress/ejb/beanB/TxBeanB.java
@@ -16,8 +16,8 @@
package com.sun.s1peqe.transaction.txstress.ejb.beanB;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
import java.sql.Statement;
import javax.transaction.UserTransaction;
diff --git a/appserver/tests/appserv-tests/devtests/transaction/txstress/ejb/beanB/TxRemoteB.java b/appserver/tests/appserv-tests/devtests/transaction/txstress/ejb/beanB/TxRemoteB.java
index 02dd0b8..9f831b8 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/txstress/ejb/beanB/TxRemoteB.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/txstress/ejb/beanB/TxRemoteB.java
@@ -16,7 +16,7 @@
package com.sun.s1peqe.transaction.txstress.ejb.beanB;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
import java.rmi.RemoteException;
public interface TxRemoteB extends EJBObject{
diff --git a/appserver/tests/appserv-tests/devtests/transaction/txstress/ejb/beanB/TxRemoteHomeB.java b/appserver/tests/appserv-tests/devtests/transaction/txstress/ejb/beanB/TxRemoteHomeB.java
index 4a47990..98aacfa 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/txstress/ejb/beanB/TxRemoteHomeB.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/txstress/ejb/beanB/TxRemoteHomeB.java
@@ -16,9 +16,9 @@
package com.sun.s1peqe.transaction.txstress.ejb.beanB;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
import java.rmi.RemoteException;
-import javax.ejb.CreateException;
+import jakarta.ejb.CreateException;
public interface TxRemoteHomeB extends EJBHome {
public TxRemoteB create() throws RemoteException, CreateException;
diff --git a/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanA/TxBeanA.java b/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanA/TxBeanA.java
index ddc8928..5d89baa 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanA/TxBeanA.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanA/TxBeanA.java
@@ -16,8 +16,8 @@
package com.sun.s1peqe.transaction.txstressreadonly.ejb.beanA;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.rmi.PortableRemoteObject;
diff --git a/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanA/TxRemoteA.java b/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanA/TxRemoteA.java
index 09318dc..d974a3f 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanA/TxRemoteA.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanA/TxRemoteA.java
@@ -16,7 +16,7 @@
package com.sun.s1peqe.transaction.txstressreadonly.ejb.beanA;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
import java.rmi.RemoteException;
public interface TxRemoteA extends EJBObject{
diff --git a/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanA/TxRemoteHomeA.java b/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanA/TxRemoteHomeA.java
index a86f169..cb77f25 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanA/TxRemoteHomeA.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanA/TxRemoteHomeA.java
@@ -16,9 +16,9 @@
package com.sun.s1peqe.transaction.txstressreadonly.ejb.beanA;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
import java.rmi.RemoteException;
-import javax.ejb.CreateException;
+import jakarta.ejb.CreateException;
public interface TxRemoteHomeA extends EJBHome {
public TxRemoteA create() throws RemoteException, CreateException;
diff --git a/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanB/TxBeanB.java b/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanB/TxBeanB.java
index a43e678..5031cb8 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanB/TxBeanB.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanB/TxBeanB.java
@@ -16,8 +16,8 @@
package com.sun.s1peqe.transaction.txstressreadonly.ejb.beanB;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
import java.sql.Statement;
import java.sql.ResultSet;
diff --git a/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanB/TxRemoteB.java b/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanB/TxRemoteB.java
index b9c145a..09795af 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanB/TxRemoteB.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanB/TxRemoteB.java
@@ -16,7 +16,7 @@
package com.sun.s1peqe.transaction.txstressreadonly.ejb.beanB;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
import java.rmi.RemoteException;
public interface TxRemoteB extends EJBObject{
diff --git a/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanB/TxRemoteHomeB.java b/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanB/TxRemoteHomeB.java
index 2300762..5c0fb4c 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanB/TxRemoteHomeB.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanB/TxRemoteHomeB.java
@@ -16,9 +16,9 @@
package com.sun.s1peqe.transaction.txstressreadonly.ejb.beanB;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
import java.rmi.RemoteException;
-import javax.ejb.CreateException;
+import jakarta.ejb.CreateException;
public interface TxRemoteHomeB extends EJBHome {
public TxRemoteB create() throws RemoteException, CreateException;
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/src/java/net/max/ee/sfsb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/src/java/net/max/ee/sfsb/SimpleSessionBean.java
index 5f1e9d9..99d3582 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/src/java/net/max/ee/sfsb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/src/java/net/max/ee/sfsb/SimpleSessionBean.java
@@ -24,9 +24,9 @@
import java.io.Serializable;
import java.util.concurrent.atomic.AtomicInteger;
import jakarta.annotation.PreDestroy;
-import javax.ejb.LocalBean;
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
+import jakarta.ejb.LocalBean;
+import jakarta.ejb.Remove;
+import jakarta.ejb.Stateful;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/src/java/net/max/ee/sfsb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/src/java/net/max/ee/sfsb/SimpleSessionBean.java
index 5f1e9d9..99d3582 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/src/java/net/max/ee/sfsb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/src/java/net/max/ee/sfsb/SimpleSessionBean.java
@@ -24,9 +24,9 @@
import java.io.Serializable;
import java.util.concurrent.atomic.AtomicInteger;
import jakarta.annotation.PreDestroy;
-import javax.ejb.LocalBean;
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
+import jakarta.ejb.LocalBean;
+import jakarta.ejb.Remove;
+import jakarta.ejb.Stateful;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java
index 0bdba81..f71a559 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java
@@ -24,9 +24,9 @@
import java.io.Serializable;
import java.util.concurrent.atomic.AtomicInteger;
import jakarta.annotation.PreDestroy;
-import javax.ejb.LocalBean;
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
+import jakarta.ejb.LocalBean;
+import jakarta.ejb.Remove;
+import jakarta.ejb.Stateful;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithEjbLite/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithEjbLite/servlet/TestServlet.java
index b9129a1..bc2420f 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithEjbLite/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithEjbLite/servlet/TestServlet.java
@@ -17,7 +17,7 @@
package test;
import java.io.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import javax.servlet.*;
import javax.servlet.http.*;
import javax.servlet.annotation.WebServlet;
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithEjbLite/servlet/WFStatelessBean.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithEjbLite/servlet/WFStatelessBean.java
index e54eef6..56fba77 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithEjbLite/servlet/WFStatelessBean.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithEjbLite/servlet/WFStatelessBean.java
@@ -16,8 +16,8 @@
package wftest;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
@Stateless
public class WFStatelessBean {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithEjbLite/servlet/WFStatelessBean2.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithEjbLite/servlet/WFStatelessBean2.java
index 5ec5c3d..ca3329b 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithEjbLite/servlet/WFStatelessBean2.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithEjbLite/servlet/WFStatelessBean2.java
@@ -16,7 +16,7 @@
package wftest;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
@Stateless
public class WFStatelessBean2 {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/runAsInitDestroy/servlet/StatelessBean.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/runAsInitDestroy/servlet/StatelessBean.java
index ca28661..52a1db3 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/runAsInitDestroy/servlet/StatelessBean.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/runAsInitDestroy/servlet/StatelessBean.java
@@ -15,8 +15,8 @@
*/
import jakarta.annotation.security.RolesAllowed;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
@Stateless
@RolesAllowed("staff")
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/runAsInitDestroy/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/runAsInitDestroy/servlet/TestServlet.java
index 10df505..2bcea0c 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/runAsInitDestroy/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/runAsInitDestroy/servlet/TestServlet.java
@@ -18,7 +18,7 @@
import java.io.PrintWriter;
import jakarta.annotation.security.RunAs;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
import javax.servlet.annotation.HttpConstraint;
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/referenceDescriptor/servlet/test/Sless.java b/appserver/tests/appserv-tests/devtests/web/weblogicDD/referenceDescriptor/servlet/test/Sless.java
index 24ed52e..a82914c 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/referenceDescriptor/servlet/test/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/referenceDescriptor/servlet/test/Sless.java
@@ -16,7 +16,7 @@
package test;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface Sless {
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/referenceDescriptor/servlet/test/StatelessBean.java b/appserver/tests/appserv-tests/devtests/web/weblogicDD/referenceDescriptor/servlet/test/StatelessBean.java
index c65a616..7ccc9a3 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/referenceDescriptor/servlet/test/StatelessBean.java
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/referenceDescriptor/servlet/test/StatelessBean.java
@@ -16,7 +16,7 @@
package test;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
@Stateless(mappedName="myejb")
public class StatelessBean implements Sless {
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/referenceDescriptor/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/weblogicDD/referenceDescriptor/servlet/test/TestServlet.java
index b1f9656..bb0645e 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/referenceDescriptor/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/referenceDescriptor/servlet/test/TestServlet.java
@@ -19,7 +19,7 @@
import java.io.*;
import jakarta.annotation.Resource;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import jakarta.jms.Queue;
import javax.naming.InitialContext;
import javax.servlet.*;
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/runAsPrincipalName/servlet/test/StatelessBean.java b/appserver/tests/appserv-tests/devtests/web/weblogicDD/runAsPrincipalName/servlet/test/StatelessBean.java
index 013643c..cce804e 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/runAsPrincipalName/servlet/test/StatelessBean.java
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/runAsPrincipalName/servlet/test/StatelessBean.java
@@ -17,7 +17,7 @@
package test;
import jakarta.annotation.security.RolesAllowed;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
@Stateless
public class StatelessBean {
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/runAsPrincipalName/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/weblogicDD/runAsPrincipalName/servlet/test/TestServlet.java
index dea9830..95ba9dd 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/runAsPrincipalName/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/runAsPrincipalName/servlet/test/TestServlet.java
@@ -18,7 +18,7 @@
import java.io.*;
import jakarta.annotation.security.RunAs;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import javax.servlet.*;
import javax.servlet.http.*;
import javax.servlet.annotation.HttpConstraint;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/servlet/ServletHandlerTestImpl.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/servlet/ServletHandlerTestImpl.java
index d171a73..336e4f8 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/servlet/ServletHandlerTestImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/servlet/ServletHandlerTestImpl.java
@@ -17,8 +17,8 @@
package servlet;
import java.rmi.*;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
public class ServletHandlerTestImpl implements SessionBean {
SessionContext sc;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/provider-ejbinweb/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/provider-ejbinweb/endpoint/HelloImpl.java
index 2ba99f5..db3920a 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/provider-ejbinweb/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/provider-ejbinweb/endpoint/HelloImpl.java
@@ -19,7 +19,7 @@
import java.io.*;
import jakarta.xml.ws.Provider;
import jakarta.xml.ws.WebServiceProvider;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import javax.xml.transform.Source;
import javax.xml.transform.stream.StreamSource;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/provider/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/provider/endpoint/HelloImpl.java
index d2f83c7..7c525b4 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/provider/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/provider/endpoint/HelloImpl.java
@@ -23,7 +23,7 @@
import jakarta.xml.ws.ServiceMode;
import jakarta.xml.ws.Service ;
import jakarta.xml.soap.SOAPMessage;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import javax.xml.transform.Source;
import javax.xml.transform.stream.StreamSource;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/providerhandler/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/providerhandler/endpoint/HelloImpl.java
index 174d8ca..bc27f37 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/providerhandler/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/providerhandler/endpoint/HelloImpl.java
@@ -23,7 +23,7 @@
import jakarta.xml.ws.ServiceMode;
import jakarta.xml.ws.Service ;
import jakarta.xml.soap.SOAPMessage;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import javax.xml.transform.Source;
import javax.xml.transform.stream.StreamSource;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/ejb_endpoint/WSHelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/ejb_endpoint/WSHelloEJB.java
index 2849f57..c6749da 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/ejb_endpoint/WSHelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/ejb_endpoint/WSHelloEJB.java
@@ -17,7 +17,7 @@
package ejb_endpoint;
import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
@WebService
@Stateless
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservicerefs/ejb_endpoint/WSHelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservicerefs/ejb_endpoint/WSHelloEJB.java
index 0cd2b3e..eee82d6 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservicerefs/ejb_endpoint/WSHelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservicerefs/ejb_endpoint/WSHelloEJB.java
@@ -17,7 +17,7 @@
package ejb_endpoint;
import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
@WebService(endpointInterface="ejb_endpoint.WSHello")
@Stateless
diff --git a/appserver/tests/appserv-tests/devtests/webservice/doclit/doclit/SimpleTestImpl.java b/appserver/tests/appserv-tests/devtests/webservice/doclit/doclit/SimpleTestImpl.java
index dac32cd..e6e100e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/doclit/doclit/SimpleTestImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/doclit/doclit/SimpleTestImpl.java
@@ -23,9 +23,9 @@
import java.rmi.RemoteException;
import java.io.Serializable;
import java.rmi.RemoteException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
import javax.naming.*;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/async/endpoint/AddNumbersImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/async/endpoint/AddNumbersImpl.java
index a20f8ed..e4a7c10 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/async/endpoint/AddNumbersImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/async/endpoint/AddNumbersImpl.java
@@ -17,7 +17,7 @@
package endpoint;
import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
@WebService
@Stateless
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/client/Client.java
index f3fd3d7..372facd 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/client/Client.java
@@ -16,7 +16,7 @@
package client;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import ejb.Hello;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/ejb/Hello.java
index 12c5ecd..2baa0f0 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/ejb/Hello.java
@@ -16,7 +16,7 @@
package ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface Hello {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/ejb/HelloEJB.java
index 6faea2c..3fe23ee 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/ejb/HelloEJB.java
@@ -20,7 +20,7 @@
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import jakarta.xml.ws.WebServiceRef;
import jakarta.xml.ws.AsyncHandler;
import jakarta.xml.ws.Response;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/endpoint/WebServiceEJB.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/endpoint/WebServiceEJB.java
index a6aeb45..53aa201 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/endpoint/WebServiceEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/endpoint/WebServiceEJB.java
@@ -17,7 +17,7 @@
package endpoint;
import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
@WebService
@Stateless
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/bigint/endpoint/CustomerManager.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/bigint/endpoint/CustomerManager.java
index bc9115c..5a057d2 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/bigint/endpoint/CustomerManager.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/bigint/endpoint/CustomerManager.java
@@ -19,7 +19,7 @@
import java.math.BigInteger;
import java.util.*;
import jakarta.jws.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.persistence.*;
@Stateless
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/dependencynoinjection/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/dependencynoinjection/endpoint/HelloImpl.java
index a71374b..abd758b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/dependencynoinjection/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/dependencynoinjection/endpoint/HelloImpl.java
@@ -17,7 +17,7 @@
package endpoint;
import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
@WebService
@Stateless
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/client/Client.java
index 45b6f86..76dbcd0 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/client/Client.java
@@ -16,7 +16,7 @@
package client;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import ejb.Hello;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/ejb/Hello.java
index c517daf..86ad44f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/ejb/Hello.java
@@ -16,7 +16,7 @@
package ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface Hello {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/ejb/HelloEJB.java
index f29a15f..d95f391 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/ejb/HelloEJB.java
@@ -16,7 +16,7 @@
package ejb;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import jakarta.xml.ws.WebServiceRef;
import endpoint.WebServiceEJBService;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/endpoint/WebServiceEJB.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/endpoint/WebServiceEJB.java
index a6aeb45..53aa201 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/endpoint/WebServiceEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/endpoint/WebServiceEJB.java
@@ -17,7 +17,7 @@
package endpoint;
import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
@WebService
@Stateless
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/endpoint/HelloEjb.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/endpoint/HelloEjb.java
index afc7978..f3ca33c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/endpoint/HelloEjb.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/endpoint/HelloEjb.java
@@ -18,12 +18,12 @@
import jakarta.jws.WebService;
import jakarta.jws.WebMethod;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionContext;
import jakarta.annotation.Resource;
-@javax.ejb.Stateless
+@jakarta.ejb.Stateless
@WebService(
name="Hello",
serviceName="HelloEjbService",
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/endpoint/Hello.java
index 699d085..d5a7ae8 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/endpoint/Hello.java
@@ -19,10 +19,10 @@
import jakarta.jws.WebService;
import jakarta.jws.WebMethod;
import jakarta.annotation.Resource;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionContext;
-@javax.ejb.Stateless
+@jakarta.ejb.Stateless
@WebService(
name="Hello",
serviceName="HelloService",
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/endpoint/Hello.java
index 7c501ed..d964e8f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/endpoint/Hello.java
@@ -19,11 +19,11 @@
import jakarta.jws.WebService;
import jakarta.jws.WebMethod;
import jakarta.annotation.Resource;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionContext;
import jakarta.xml.ws.WebServiceContext;
-@javax.ejb.Stateless
+@jakarta.ejb.Stateless
@WebService(
name="Hello",
serviceName="HelloService",
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/endpoint/Hello.java
index 48ffa7c..a3b9a7c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/endpoint/Hello.java
@@ -19,10 +19,10 @@
import jakarta.jws.WebService;
import jakarta.jws.WebMethod;
import jakarta.annotation.Resource;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionContext;
-@javax.ejb.Stateless
+@jakarta.ejb.Stateless
@WebService(
name="Hello",
serviceName="HelloService",
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/endpoint/Hello.java
index 8b1a625..86fa82c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/endpoint/Hello.java
@@ -19,10 +19,10 @@
import jakarta.jws.WebService;
import jakarta.jws.WebMethod;
import jakarta.annotation.Resource;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionContext;
-@javax.ejb.Stateless
+@jakarta.ejb.Stateless
@WebService(
name="Hello",
serviceName="HelloService",
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar/endpoint/Hello.java
index 7b7ae8a..665690a 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar/endpoint/Hello.java
@@ -18,12 +18,12 @@
import jakarta.jws.WebService;
import jakarta.jws.WebMethod;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionContext;
import jakarta.annotation.Resource;
-@javax.ejb.Stateless
+@jakarta.ejb.Stateless
@WebService(
name="Hello",
serviceName="HelloService",
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwsinwarwithwsdl/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwsinwarwithwsdl/endpoint/Hello.java
index c4e2990..34ab65f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwsinwarwithwsdl/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwsinwarwithwsdl/endpoint/Hello.java
@@ -18,12 +18,12 @@
import jakarta.jws.WebService;
import jakarta.jws.WebMethod;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionContext;
import jakarta.annotation.Resource;
-@javax.ejb.Stateless
+@jakarta.ejb.Stateless
@WebService(serviceName = "HelloService", portName = "HelloPort", targetNamespace = "http://example.com/Hello", endpointInterface = "com.example.hello.Hello", wsdlLocation = "WEB-INF/wsdl/HelloService.wsdl")
public class Hello {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/exception/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/exception/endpoint/HelloImpl.java
index c830f08..70084ac 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/exception/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/exception/endpoint/HelloImpl.java
@@ -17,7 +17,7 @@
package endpoint;
import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
@WebService
@Stateless
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/invalidmethodinjection/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/invalidmethodinjection/endpoint/HelloImpl.java
index a71374b..abd758b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/invalidmethodinjection/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/invalidmethodinjection/endpoint/HelloImpl.java
@@ -17,7 +17,7 @@
package endpoint;
import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
@WebService
@Stateless
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent-2/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent-2/endpoint/HelloImpl.java
index 9192c67..22025b5 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent-2/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent-2/endpoint/HelloImpl.java
@@ -17,7 +17,7 @@
package endpoint;
import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import outsidepkg.RetVal;
@WebService
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent/endpoint/HelloImpl.java
index 9192c67..22025b5 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent/endpoint/HelloImpl.java
@@ -17,7 +17,7 @@
package endpoint;
import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import outsidepkg.RetVal;
@WebService
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/client/Client.java
index ac6940a..1ef7a13 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/client/Client.java
@@ -16,7 +16,7 @@
package client;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import ejb.Hello;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/ejb/Hello.java
index c517daf..86ad44f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/ejb/Hello.java
@@ -16,7 +16,7 @@
package ejb;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
@Remote
public interface Hello {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/ejb/HelloEJB.java
index f29a15f..d95f391 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/ejb/HelloEJB.java
@@ -16,7 +16,7 @@
package ejb;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import jakarta.xml.ws.WebServiceRef;
import endpoint.WebServiceEJBService;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/endpoint/NewSessionBeanLocal.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/endpoint/NewSessionBeanLocal.java
index 9ad7562..b9b572f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/endpoint/NewSessionBeanLocal.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/endpoint/NewSessionBeanLocal.java
@@ -16,7 +16,7 @@
package endpoint;
-import javax.ejb.Local;
+import jakarta.ejb.Local;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/endpoint/NewSessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/endpoint/NewSessionBeanRemote.java
index e7d1fcd..6344440 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/endpoint/NewSessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/endpoint/NewSessionBeanRemote.java
@@ -16,7 +16,7 @@
package endpoint;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/endpoint/WebServiceEJB.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/endpoint/WebServiceEJB.java
index 33f2651..e642718 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/endpoint/WebServiceEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/endpoint/WebServiceEJB.java
@@ -17,7 +17,7 @@
package endpoint;
import jakarta.jws.WebService;
-import javax.ejb.*;
+import jakarta.ejb.*;
@WebService
@Stateless
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/messagectxt/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/messagectxt/endpoint/HelloImpl.java
index 21042cd..91f6459 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/messagectxt/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/messagectxt/endpoint/HelloImpl.java
@@ -17,10 +17,10 @@
package endpoint;
import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import jakarta.annotation.Resource;
import jakarta.xml.ws.WebServiceContext;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionContext;
@WebService
@Stateless
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/methodinjection/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/methodinjection/endpoint/HelloImpl.java
index a71374b..abd758b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/methodinjection/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/methodinjection/endpoint/HelloImpl.java
@@ -17,7 +17,7 @@
package endpoint;
import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
@WebService
@Stateless
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxinterceptor/endpoint/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxinterceptor/endpoint/HelloEJB.java
index 54e47c3..0fe6ebf 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxinterceptor/endpoint/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxinterceptor/endpoint/HelloEJB.java
@@ -19,7 +19,7 @@
import java.util.Map;
import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import jakarta.annotation.Resource;
import jakarta.xml.ws.WebServiceContext;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxt/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxt/endpoint/HelloImpl.java
index a2c9c32..c06f183 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxt/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxt/endpoint/HelloImpl.java
@@ -17,7 +17,7 @@
package endpoint;
import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import jakarta.annotation.Resource;
import jakarta.xml.ws.WebServiceContext;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/service/Hello1Impl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/service/Hello1Impl.java
index 12808a9..eb847ca 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/service/Hello1Impl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/service/Hello1Impl.java
@@ -27,7 +27,7 @@
import jakarta.jws.WebService;
-@javax.ejb.Stateless
+@jakarta.ejb.Stateless
@jakarta.jws.WebService(
serviceName="HttpTestService",
endpointInterface="service.Hello1",
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/service/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/service/HelloImpl.java
index 471cecf..67df4bb 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/service/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/service/HelloImpl.java
@@ -27,7 +27,7 @@
import jakarta.jws.WebService;
-@javax.ejb.Stateless
+@jakarta.ejb.Stateless
@jakarta.jws.WebService(
serviceName="HttpTestService",
endpointInterface="service.Hello",
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/nointf/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/nointf/endpoint/HelloImpl.java
index a71374b..abd758b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/nointf/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/nointf/endpoint/HelloImpl.java
@@ -17,7 +17,7 @@
package endpoint;
import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
@WebService
@Stateless
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/noname/endpoint/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/noname/endpoint/HelloEJB.java
index 37db4a6..8c1b556 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/noname/endpoint/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/noname/endpoint/HelloEJB.java
@@ -17,7 +17,7 @@
package endpoint;
import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
@WebService(endpointInterface="endpoint.Hello")
@Stateless
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/oneway/endpoint/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/oneway/endpoint/HelloEJB.java
index 3a971e9..f6bed8e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/oneway/endpoint/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/oneway/endpoint/HelloEJB.java
@@ -17,7 +17,7 @@
package endpoint;
import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
@WebService(endpointInterface="endpoint.Hello")
@Stateless
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portdependencynoinjection/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portdependencynoinjection/endpoint/HelloImpl.java
index a71374b..abd758b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portdependencynoinjection/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portdependencynoinjection/endpoint/HelloImpl.java
@@ -17,7 +17,7 @@
package endpoint;
import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
@WebService
@Stateless
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portejbclient/ejb/GatewayImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portejbclient/ejb/GatewayImpl.java
index 974d83c..099d530 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portejbclient/ejb/GatewayImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portejbclient/ejb/GatewayImpl.java
@@ -18,7 +18,7 @@
import jakarta.jws.WebService;
import jakarta.jws.WebMethod;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import jakarta.xml.ws.WebServiceRef;
import javax.naming.Context;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portejbclient/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portejbclient/endpoint/HelloImpl.java
index a71374b..abd758b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portejbclient/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portejbclient/endpoint/HelloImpl.java
@@ -17,7 +17,7 @@
package endpoint;
import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
@WebService
@Stateless
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portfieldinjection/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portfieldinjection/endpoint/HelloImpl.java
index a71374b..abd758b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portfieldinjection/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portfieldinjection/endpoint/HelloImpl.java
@@ -17,7 +17,7 @@
package endpoint;
import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
@WebService
@Stateless
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portmethodinjection/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portmethodinjection/endpoint/HelloImpl.java
index a71374b..abd758b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portmethodinjection/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portmethodinjection/endpoint/HelloImpl.java
@@ -17,7 +17,7 @@
package endpoint;
import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
@WebService
@Stateless
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/provider/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/provider/endpoint/HelloImpl.java
index b194629..5a28123 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/provider/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/provider/endpoint/HelloImpl.java
@@ -23,7 +23,7 @@
import jakarta.xml.ws.ServiceMode;
import jakarta.xml.ws.Service ;
import jakarta.xml.soap.SOAPMessage;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import javax.xml.transform.Source;
import javax.xml.transform.stream.StreamSource;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/restful-ejb/endpoint/AddNumbersImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/restful-ejb/endpoint/AddNumbersImpl.java
index c5b3b35..cb4b41f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/restful-ejb/endpoint/AddNumbersImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/restful-ejb/endpoint/AddNumbersImpl.java
@@ -31,7 +31,7 @@
import jakarta.xml.ws.http.HTTPException;
import jakarta.xml.ws.http.HTTPBinding;
import jakarta.xml.ws.BindingType;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
@WebServiceProvider
@Stateless
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/security/roles/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/security/roles/endpoint/HelloImpl.java
index 0c3a144..adc9bfc 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/security/roles/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/security/roles/endpoint/HelloImpl.java
@@ -17,7 +17,7 @@
package endpoint;
import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import jakarta.annotation.security.RolesAllowed;
import jakarta.annotation.security.DenyAll;
import jakarta.annotation.security.PermitAll;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/serviceejbclient/ejb/GatewayImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/serviceejbclient/ejb/GatewayImpl.java
index e7a1fd6..a0403dc 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/serviceejbclient/ejb/GatewayImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/serviceejbclient/ejb/GatewayImpl.java
@@ -18,7 +18,7 @@
import jakarta.jws.WebService;
import jakarta.jws.WebMethod;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import jakarta.xml.ws.WebServiceRef;
import javax.naming.Context;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/serviceejbclient/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/serviceejbclient/endpoint/HelloImpl.java
index a71374b..abd758b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/serviceejbclient/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/serviceejbclient/endpoint/HelloImpl.java
@@ -17,7 +17,7 @@
package endpoint;
import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
@WebService
@Stateless
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/sessionctx/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/sessionctx/endpoint/HelloImpl.java
index 3672901..5ecbcb1 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/sessionctx/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/sessionctx/endpoint/HelloImpl.java
@@ -17,10 +17,10 @@
package endpoint;
import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import jakarta.annotation.Resource;
import jakarta.xml.ws.WebServiceContext;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionContext;
import java.security.Principal;
@WebService
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/singleton/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/singleton/endpoint/HelloImpl.java
index c4f2804..82cd60f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/singleton/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/singleton/endpoint/HelloImpl.java
@@ -17,7 +17,7 @@
package endpoint;
import jakarta.jws.WebService;
-import javax.ejb.Singleton;
+import jakarta.ejb.Singleton;
import outsidepkg.RetVal;
@WebService
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/svchandler/endpoint/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/svchandler/endpoint/HelloEJB.java
index d0c8771..c8213bc 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/svchandler/endpoint/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/svchandler/endpoint/HelloEJB.java
@@ -17,7 +17,7 @@
package endpoint;
import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
@WebService(endpointInterface="endpoint.Hello")
@Stateless
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/endpoint/Hello.java
index 4d30eb5..93b799c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/endpoint/Hello.java
@@ -19,7 +19,7 @@
import jakarta.jws.WebService;
import jakarta.jws.WebMethod;
-@javax.ejb.Stateless
+@jakarta.ejb.Stateless
@WebService(
name="Hello",
serviceName="HelloService",
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxt/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxt/endpoint/HelloImpl.java
index 59b5c34..ca8dd25 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxt/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxt/endpoint/HelloImpl.java
@@ -17,10 +17,10 @@
package endpoint;
import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import jakarta.annotation.Resource;
import jakarta.xml.ws.WebServiceContext;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionContext;
@WebService
@Stateless
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxtinterceptor/endpoint/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxtinterceptor/endpoint/HelloEJB.java
index 8b3eb0d..06aea64 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxtinterceptor/endpoint/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxtinterceptor/endpoint/HelloEJB.java
@@ -19,7 +19,7 @@
import java.util.Map;
import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import jakarta.annotation.Resource;
import jakarta.xml.ws.WebServiceContext;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsnameejbname/endpoint/AddNumbersImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsnameejbname/endpoint/AddNumbersImpl.java
index e502ee5..f923a48 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsnameejbname/endpoint/AddNumbersImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsnameejbname/endpoint/AddNumbersImpl.java
@@ -17,7 +17,7 @@
package endpoint;
import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
@WebService(name="ThisShouldBeIgnored")
@Stateless
diff --git a/appserver/tests/appserv-tests/devtests/webservice/google/ejb/GoogleEJB.java b/appserver/tests/appserv-tests/devtests/webservice/google/ejb/GoogleEJB.java
index d9be7b7..1bb0adf 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/google/ejb/GoogleEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/google/ejb/GoogleEJB.java
@@ -18,9 +18,9 @@
import java.io.Serializable;
import java.rmi.RemoteException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
import javax.naming.*;
import javax.xml.rpc.handler.MessageContext;
import java.security.Principal;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/ejb/GoogleEJB.java b/appserver/tests/appserv-tests/devtests/webservice/googleserver/ejb/GoogleEJB.java
index 62aa812..6b935cb 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/ejb/GoogleEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/googleserver/ejb/GoogleEJB.java
@@ -25,9 +25,9 @@
import javax.xml.rpc.Call;
import java.io.Serializable;
import java.rmi.RemoteException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
import javax.naming.*;
public class GoogleEJB implements SessionBean {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/handler/ejb/SimpleServerImpl.java b/appserver/tests/appserv-tests/devtests/webservice/handler/ejb/SimpleServerImpl.java
index edce913..b34ce51 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/handler/ejb/SimpleServerImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/handler/ejb/SimpleServerImpl.java
@@ -17,8 +17,8 @@
package ejb;
import java.rmi.*;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
public class SimpleServerImpl implements SessionBean {
SessionContext sc;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/provider/endpoint/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/provider/endpoint/ejb/HelloEJB.java
index 234cb66..afab69f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/provider/endpoint/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/provider/endpoint/ejb/HelloEJB.java
@@ -18,7 +18,7 @@
import jakarta.jws.WebService;
import jakarta.xml.ws.WebServiceRef;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
@WebService(endpointInterface="endpoint.ejb.Hello", targetNamespace="http://endpoint/ejb")
@Stateless
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/ejb/InterestEJB.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/ejb/InterestEJB.java
index 187cce6..d6f94af 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/ejb/InterestEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/ejb/InterestEJB.java
@@ -18,9 +18,9 @@
import java.io.Serializable;
import java.rmi.RemoteException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
import javax.naming.*;
public class InterestEJB implements SessionBean {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/ejb/InterestEJB.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/ejb/InterestEJB.java
index 0849a7a..4d1f19f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/ejb/InterestEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/ejb/InterestEJB.java
@@ -18,9 +18,9 @@
import java.io.Serializable;
import java.rmi.RemoteException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
import javax.naming.*;
public class InterestEJB implements SessionBean {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/ejb/InterestEJB.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/ejb/InterestEJB.java
index 187cce6..d6f94af 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/ejb/InterestEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/ejb/InterestEJB.java
@@ -18,9 +18,9 @@
import java.io.Serializable;
import java.rmi.RemoteException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
import javax.naming.*;
public class InterestEJB implements SessionBean {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/endpoint/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/endpoint/ejb/HelloEJB.java
index a1a1d68..140281c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/endpoint/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/endpoint/ejb/HelloEJB.java
@@ -19,8 +19,8 @@
import java.security.Principal;
import jakarta.jws.WebService;
import jakarta.xml.ws.WebServiceRef;
-import javax.ejb.Stateless;
-import javax.ejb.SessionContext;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.SessionContext;
import jakarta.annotation.Resource;
@WebService(endpointInterface="endpoint.ejb.Hello", targetNamespace="http://endpoint/ejb")
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_ejb/endpoint/jaxws/HiEJB.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_ejb/endpoint/jaxws/HiEJB.java
index 19259b1..f9801bb 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_ejb/endpoint/jaxws/HiEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_ejb/endpoint/jaxws/HiEJB.java
@@ -17,7 +17,7 @@
package endpoint.jaxws;
import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
@WebService(endpointInterface="endpoint.jaxws.Hi",targetNamespace="http://endpoint/jaxws")
@Stateless
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/endpoint/jaxws/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/endpoint/jaxws/HelloEJB.java
index f79e075..d05f423 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/endpoint/jaxws/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/endpoint/jaxws/HelloEJB.java
@@ -17,7 +17,7 @@
package endpoint.jaxws;
import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
@WebService(endpointInterface="endpoint.jaxws.Hello", targetNamespace="http://endpoint/jaxws")
@Stateless
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/src/java/entapp/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/src/java/entapp/ejb/HelloEJB.java
index 243baad..2788e7c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/src/java/entapp/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/src/java/entapp/ejb/HelloEJB.java
@@ -25,7 +25,7 @@
package entapp.ejb;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
import jakarta.jws.WebMethod;
import jakarta.jws.WebParam;
import jakarta.jws.WebService;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/endpoint/Calculator.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/endpoint/Calculator.java
index a9cd352..b522b9f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/endpoint/Calculator.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/endpoint/Calculator.java
@@ -18,8 +18,8 @@
import jakarta.jws.WebService;
import jakarta.jws.WebMethod;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
@WebService(
name="Calculator",
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/endpoint/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/endpoint/ejb/HelloEJB.java
index c158118..249df90 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/endpoint/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/endpoint/ejb/HelloEJB.java
@@ -18,10 +18,10 @@
import jakarta.jws.WebService;
import jakarta.xml.ws.WebServiceRef;
-import javax.ejb.Stateless;
-import javax.ejb.SessionContext;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
import jakarta.annotation.Resource;
import java.sql.*;
import javax.sql.DataSource;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/endpoint/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/endpoint/ejb/HelloEJB.java
index cce8f54..b0b504e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/endpoint/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/endpoint/ejb/HelloEJB.java
@@ -18,10 +18,10 @@
import jakarta.jws.WebService;
import jakarta.xml.ws.WebServiceRef;
-import javax.ejb.Stateless;
-import javax.ejb.SessionContext;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
import jakarta.annotation.Resource;
import java.sql.*;
import javax.sql.DataSource;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/endpoint/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/endpoint/ejb/HelloEJB.java
index 029907f..91ea7e6 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/endpoint/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/endpoint/ejb/HelloEJB.java
@@ -18,10 +18,10 @@
import jakarta.jws.WebService;
import jakarta.xml.ws.WebServiceRef;
-import javax.ejb.Stateless;
-import javax.ejb.SessionContext;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
import jakarta.annotation.Resource;
import java.sql.*;
import javax.sql.DataSource;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/endpoint/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/endpoint/ejb/HelloEJB.java
index 28130f9..8d2468d 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/endpoint/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/endpoint/ejb/HelloEJB.java
@@ -18,10 +18,10 @@
import jakarta.jws.WebService;
import jakarta.xml.ws.WebServiceRef;
-import javax.ejb.Stateless;
-import javax.ejb.SessionContext;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
import jakarta.annotation.Resource;
import java.sql.*;
import javax.sql.DataSource;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/signatureejb/SignatureEJB.java b/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/signatureejb/SignatureEJB.java
index f68cebb..26fd613 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/signatureejb/SignatureEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/signatureejb/SignatureEJB.java
@@ -18,9 +18,9 @@
import java.io.Serializable;
import java.rmi.RemoteException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
import javax.naming.*;
import javax.xml.rpc.handler.MessageContext;
import java.util.Date;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/rpclit/rpclit/SimpleTestImpl.java b/appserver/tests/appserv-tests/devtests/webservice/rpclit/rpclit/SimpleTestImpl.java
index 421751a..c0b592e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/rpclit/rpclit/SimpleTestImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/rpclit/rpclit/SimpleTestImpl.java
@@ -23,9 +23,9 @@
import java.rmi.RemoteException;
import java.io.Serializable;
import java.rmi.RemoteException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
import javax.naming.*;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb3_ssl_cacert/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/security/ejb3_ssl_cacert/endpoint/HelloImpl.java
index 6775acc..3ac0fb9 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb3_ssl_cacert/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/security/ejb3_ssl_cacert/endpoint/HelloImpl.java
@@ -17,7 +17,7 @@
package endpoint;
import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
@WebService
@Stateless
diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/ejb/FedTaxEjb.java b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/ejb/FedTaxEjb.java
index 36ff3b0..f45cb45 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/ejb/FedTaxEjb.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/ejb/FedTaxEjb.java
@@ -18,9 +18,9 @@
import java.io.Serializable;
import java.rmi.RemoteException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
import javax.naming.*;
public class FedTaxEjb implements SessionBean {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/ejb/StateTaxEjb.java b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/ejb/StateTaxEjb.java
index 293abc0..78cea45 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/ejb/StateTaxEjb.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/ejb/StateTaxEjb.java
@@ -18,9 +18,9 @@
import java.io.Serializable;
import java.rmi.RemoteException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
import javax.naming.*;
public class StateTaxEjb implements SessionBean {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/servlet/ServletHandlerTestImpl.java b/appserver/tests/appserv-tests/devtests/webservice/servlethandler/servlet/ServletHandlerTestImpl.java
index d171a73..336e4f8 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/servlet/ServletHandlerTestImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/servlethandler/servlet/ServletHandlerTestImpl.java
@@ -17,8 +17,8 @@
package servlet;
import java.rmi.*;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
public class ServletHandlerTestImpl implements SessionBean {
SessionContext sc;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/simplefault/ejb/SimpleSoapFaultImpl.java b/appserver/tests/appserv-tests/devtests/webservice/simplefault/ejb/SimpleSoapFaultImpl.java
index c55506b..4f68723 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/simplefault/ejb/SimpleSoapFaultImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/simplefault/ejb/SimpleSoapFaultImpl.java
@@ -22,9 +22,9 @@
package soapfault.ejb;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
import java.rmi.RemoteException;
/**
diff --git a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/ejb/SoapFaultsEJB.java b/appserver/tests/appserv-tests/devtests/webservice/soapfaults/ejb/SoapFaultsEJB.java
index 0a693cd..4ec0566 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/ejb/SoapFaultsEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/soapfaults/ejb/SoapFaultsEJB.java
@@ -18,9 +18,9 @@
import java.io.Serializable;
import java.rmi.RemoteException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
import javax.naming.*;
import javax.xml.rpc.handler.MessageContext;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/stubprops/SimpleServerImpl.java b/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/stubprops/SimpleServerImpl.java
index c003486..b71c4fe 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/stubprops/SimpleServerImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/stubprops/SimpleServerImpl.java
@@ -22,9 +22,9 @@
package stubprops;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
import java.rmi.RemoteException;
/**
diff --git a/appserver/tests/appserv-tests/devtests/webservice/wls_dd/service_endpoint_address/endpoint/AddNumbersImpl.java b/appserver/tests/appserv-tests/devtests/webservice/wls_dd/service_endpoint_address/endpoint/AddNumbersImpl.java
index 80905a1..12b6c10 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/wls_dd/service_endpoint_address/endpoint/AddNumbersImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/wls_dd/service_endpoint_address/endpoint/AddNumbersImpl.java
@@ -17,7 +17,7 @@
package endpoint;
import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
/**
* @author Rama Pulavarthi
*/
diff --git a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/ejb/FaultCodeEJB.java b/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/ejb/FaultCodeEJB.java
index 2c69132..e997514 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/ejb/FaultCodeEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/ejb/FaultCodeEJB.java
@@ -18,9 +18,9 @@
import java.io.Serializable;
import java.rmi.RemoteException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
import javax.naming.*;
import javax.xml.rpc.handler.MessageContext;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/xsdany/ejb/XsdAnyEJB.java b/appserver/tests/appserv-tests/devtests/webservice/xsdany/ejb/XsdAnyEJB.java
index 3a21b68..be667d5 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/xsdany/ejb/XsdAnyEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/xsdany/ejb/XsdAnyEJB.java
@@ -18,9 +18,9 @@
import java.io.Serializable;
import java.rmi.RemoteException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
import javax.naming.*;
import javax.xml.rpc.handler.MessageContext;
diff --git a/appserver/tests/appserv-tests/util/reporter/EnterpriseBeanLogger.java b/appserver/tests/appserv-tests/util/reporter/EnterpriseBeanLogger.java
index f2f0c36..f092664 100644
--- a/appserver/tests/appserv-tests/util/reporter/EnterpriseBeanLogger.java
+++ b/appserver/tests/appserv-tests/util/reporter/EnterpriseBeanLogger.java
@@ -18,7 +18,7 @@
import java.rmi.RemoteException;
import javax.rmi.PortableRemoteObject;
-import javax.ejb.*;
+import jakarta.ejb.*;
import javax.transaction.*;
import javax.naming.*;
@@ -57,7 +57,7 @@
private static int instanceCreated;
protected String instanceName;
- protected boolean prepareLocalAndRemoteObject(String localRef, String remoteRef) throws javax.ejb.CreateException {
+ protected boolean prepareLocalAndRemoteObject(String localRef, String remoteRef) throws jakarta.ejb.CreateException {
instanceCreated++;
instanceName = getClass().getName() + "____________________" + instanceCreated;
diff --git a/appserver/tests/appserv-tests/util/reporter/PortableAdapter.java b/appserver/tests/appserv-tests/util/reporter/PortableAdapter.java
index 7515c29..91521d4 100644
--- a/appserver/tests/appserv-tests/util/reporter/PortableAdapter.java
+++ b/appserver/tests/appserv-tests/util/reporter/PortableAdapter.java
@@ -19,9 +19,9 @@
import java.io.Serializable;
import java.rmi.Remote;
import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
-import javax.ejb.FinderException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.FinderException;
import java.util.ArrayList;
public interface PortableAdapter{
diff --git a/appserver/tests/appserv-tests/util/reporter/build.properties b/appserver/tests/appserv-tests/util/reporter/build.properties
index 315bc1e..cb51aa5 100644
--- a/appserver/tests/appserv-tests/util/reporter/build.properties
+++ b/appserver/tests/appserv-tests/util/reporter/build.properties
@@ -1,5 +1,5 @@
<property environment="myenv" />
-<property name="javapath" value="${myenv.JAVA_HOME}/lib/dt.jar:$(myenv.JAVA_HOME)/lib/tools.jar:${myenv.S1AS_HOME}/modules/javax.ejb.jar"/>
+<property name="javapath" value="${myenv.JAVA_HOME}/lib/dt.jar:$(myenv.JAVA_HOME)/lib/tools.jar:${myenv.S1AS_HOME}/modules/jakarta.ejb.jar"/>
<property name="classpath" value="${javapath}"/>
