Jakarta EJB namespace transition
Signed-off-by: Gaurav Gupta <gaurav.gupta@payara.fish>
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;
