Jakarta Transaction API namespace transition Signed-off-by: Gaurav Gupta <gaurav.gupta@payara.fish>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/servlet/NoInterfaceEJBTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/servlet/NoInterfaceEJBTestServlet.java index 976bbd3..1c953b0 100644 --- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/servlet/NoInterfaceEJBTestServlet.java +++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/servlet/NoInterfaceEJBTestServlet.java
@@ -35,7 +35,7 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import test.beans.TestBeanInterface; import test.beans.artifacts.InjectViaAtEJB; import test.beans.artifacts.InjectViaAtInject;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/util/JpaTest.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/util/JpaTest.java index ce5f261..f0dc4d6 100644 --- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/util/JpaTest.java +++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/util/JpaTest.java
@@ -19,7 +19,7 @@ import jakarta.persistence.EntityManager; import jakarta.persistence.EntityManagerFactory; import jakarta.persistence.Query; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import test.entity.Department; import test.entity.Employee;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/servlet/test/servlet/JPAResourceInjectionServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/servlet/test/servlet/JPAResourceInjectionServlet.java index 0571200..c5ff904 100644 --- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/servlet/test/servlet/JPAResourceInjectionServlet.java +++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/servlet/test/servlet/JPAResourceInjectionServlet.java
@@ -29,7 +29,7 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import test.beans.TestBeanInterface; import test.beans.artifacts.Preferred;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/servlet/test/util/JpaTest.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/servlet/test/util/JpaTest.java index ce5f261..f0dc4d6 100644 --- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/servlet/test/util/JpaTest.java +++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/servlet/test/util/JpaTest.java
@@ -19,7 +19,7 @@ import jakarta.persistence.EntityManager; import jakarta.persistence.EntityManagerFactory; import jakarta.persistence.Query; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import test.entity.Department; import test.entity.Employee;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/servlet/test/servlet/JPAResourceInjectionServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/servlet/test/servlet/JPAResourceInjectionServlet.java index 34b0fbe..0b0db6f 100644 --- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/servlet/test/servlet/JPAResourceInjectionServlet.java +++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/servlet/test/servlet/JPAResourceInjectionServlet.java
@@ -29,7 +29,7 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import test.beans.TestBeanInterface; import test.beans.artifacts.Preferred;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/servlet/test/util/JpaTest.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/servlet/test/util/JpaTest.java index ce5f261..f0dc4d6 100644 --- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/servlet/test/util/JpaTest.java +++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/servlet/test/util/JpaTest.java
@@ -19,7 +19,7 @@ import jakarta.persistence.EntityManager; import jakarta.persistence.EntityManagerFactory; import jakarta.persistence.Query; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import test.entity.Department; import test.entity.Employee;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/servlet/test/servlet/JPAResourceInjectionServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/servlet/test/servlet/JPAResourceInjectionServlet.java index 80c89af..72eee42 100644 --- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/servlet/test/servlet/JPAResourceInjectionServlet.java +++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/servlet/test/servlet/JPAResourceInjectionServlet.java
@@ -29,7 +29,7 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import test.beans.TestBeanInterface; import test.beans.artifacts.Preferred;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/servlet/test/util/JpaTest.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/servlet/test/util/JpaTest.java index ce5f261..f0dc4d6 100644 --- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/servlet/test/util/JpaTest.java +++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/servlet/test/util/JpaTest.java
@@ -19,7 +19,7 @@ import jakarta.persistence.EntityManager; import jakarta.persistence.EntityManagerFactory; import jakarta.persistence.Query; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import test.entity.Department; import test.entity.Employee;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/servlet/JPAResourceInjectionServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/servlet/JPAResourceInjectionServlet.java index d322a6f..4288e8d 100644 --- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/servlet/JPAResourceInjectionServlet.java +++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/servlet/JPAResourceInjectionServlet.java
@@ -29,7 +29,7 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import test.beans.TestBeanInterface; import test.beans.artifacts.Preferred;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/util/JpaTest.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/util/JpaTest.java index ce5f261..f0dc4d6 100644 --- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/util/JpaTest.java +++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/util/JpaTest.java
@@ -19,7 +19,7 @@ import jakarta.persistence.EntityManager; import jakarta.persistence.EntityManagerFactory; import jakarta.persistence.Query; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import test.entity.Department; import test.entity.Employee;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/servlet/JPAResourceInjectionServletFromSingletonEJB.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/servlet/JPAResourceInjectionServletFromSingletonEJB.java index 2185422..d2e8a76 100644 --- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/servlet/JPAResourceInjectionServletFromSingletonEJB.java +++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/servlet/JPAResourceInjectionServletFromSingletonEJB.java
@@ -29,7 +29,7 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import test.beans.TestBeanInterface; import test.beans.artifacts.Preferred;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/util/JpaTest.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/util/JpaTest.java index ce5f261..f0dc4d6 100644 --- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/util/JpaTest.java +++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/util/JpaTest.java
@@ -19,7 +19,7 @@ import jakarta.persistence.EntityManager; import jakarta.persistence.EntityManagerFactory; import jakarta.persistence.Query; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import test.entity.Department; import test.entity.Employee;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/servlet/test/servlet/JPAResourceInjectionServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/servlet/test/servlet/JPAResourceInjectionServlet.java index d30d0f0..741081b 100644 --- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/servlet/test/servlet/JPAResourceInjectionServlet.java +++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/servlet/test/servlet/JPAResourceInjectionServlet.java
@@ -29,7 +29,7 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import test.beans.TestBeanInterface; import test.beans.artifacts.Preferred;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/servlet/test/util/JpaTest.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/servlet/test/util/JpaTest.java index ce5f261..f0dc4d6 100644 --- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/servlet/test/util/JpaTest.java +++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/servlet/test/util/JpaTest.java
@@ -19,7 +19,7 @@ import jakarta.persistence.EntityManager; import jakarta.persistence.EntityManagerFactory; import jakarta.persistence.Query; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import test.entity.Department; import test.entity.Employee;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/builtin-beans/servlet/test/servlet/SimpleJavaEEIntegrationTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/builtin-beans/servlet/test/servlet/SimpleJavaEEIntegrationTestServlet.java index 4a52a20..b58702c 100644 --- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/builtin-beans/servlet/test/servlet/SimpleJavaEEIntegrationTestServlet.java +++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/builtin-beans/servlet/test/servlet/SimpleJavaEEIntegrationTestServlet.java
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.sql.DataSource; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import jakarta.validation.Validator; import jakarta.validation.ValidatorFactory;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/servlet/TestServlet.java index 23a4c44..0b96910 100644 --- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/servlet/TestServlet.java +++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/servlet/TestServlet.java
@@ -35,7 +35,7 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import test.beans.TestBean; import test.beans.TestBeanInterface;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/util/JpaTest.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/util/JpaTest.java index ce5f261..f0dc4d6 100644 --- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/util/JpaTest.java +++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/util/JpaTest.java
@@ -19,7 +19,7 @@ import jakarta.persistence.EntityManager; import jakarta.persistence.EntityManagerFactory; import jakarta.persistence.Query; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import test.entity.Department; import test.entity.Employee;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/servlet/TestServlet.java index 5ecb6a4..a9ed8ef 100644 --- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/servlet/TestServlet.java +++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/servlet/TestServlet.java
@@ -35,7 +35,7 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import test.beans.TestBean; import test.beans.TestBeanInterface;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/util/JpaTest.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/util/JpaTest.java index ce5f261..f0dc4d6 100644 --- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/util/JpaTest.java +++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/util/JpaTest.java
@@ -19,7 +19,7 @@ import jakarta.persistence.EntityManager; import jakarta.persistence.EntityManagerFactory; import jakarta.persistence.Query; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import test.entity.Department; import test.entity.Employee;
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 1dfd435..dded454 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
@@ -27,7 +27,7 @@ import java.sql.*; import java.rmi.RemoteException; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import javax.naming.*; import javax.sql.*;
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 4ab30e4..5bf9109 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
@@ -34,7 +34,7 @@ import java.sql.*; import javax.sql.*; import jakarta.jms.*; -import javax.transaction.*; +import jakarta.transaction.*; /**
diff --git a/appserver/tests/appserv-tests/devtests/cdi/transactions/transaction-scoped/servlet/test/beans/Bean1.java b/appserver/tests/appserv-tests/devtests/cdi/transactions/transaction-scoped/servlet/test/beans/Bean1.java index 6d3ba8e..63132d6 100644 --- a/appserver/tests/appserv-tests/devtests/cdi/transactions/transaction-scoped/servlet/test/beans/Bean1.java +++ b/appserver/tests/appserv-tests/devtests/cdi/transactions/transaction-scoped/servlet/test/beans/Bean1.java
@@ -19,7 +19,7 @@ import test.servlet.TransactionScopedTestServlet; import jakarta.annotation.PreDestroy; -import javax.transaction.TransactionScoped; +import jakarta.transaction.TransactionScoped; import java.io.Serializable; @TransactionScoped
diff --git a/appserver/tests/appserv-tests/devtests/cdi/transactions/transaction-scoped/servlet/test/beans/Bean2.java b/appserver/tests/appserv-tests/devtests/cdi/transactions/transaction-scoped/servlet/test/beans/Bean2.java index 54de224..d256fe9 100644 --- a/appserver/tests/appserv-tests/devtests/cdi/transactions/transaction-scoped/servlet/test/beans/Bean2.java +++ b/appserver/tests/appserv-tests/devtests/cdi/transactions/transaction-scoped/servlet/test/beans/Bean2.java
@@ -20,7 +20,7 @@ import jakarta.annotation.PreDestroy; import javax.enterprise.inject.spi.PassivationCapable; -import javax.transaction.TransactionScoped; +import jakarta.transaction.TransactionScoped; import java.io.Serializable; @TransactionScoped
diff --git a/appserver/tests/appserv-tests/devtests/cdi/transactions/transaction-scoped/servlet/test/servlet/TransactionScopedTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/transactions/transaction-scoped/servlet/test/servlet/TransactionScopedTestServlet.java index 15c0da8..b859466 100644 --- a/appserver/tests/appserv-tests/devtests/cdi/transactions/transaction-scoped/servlet/test/servlet/TransactionScopedTestServlet.java +++ b/appserver/tests/appserv-tests/devtests/cdi/transactions/transaction-scoped/servlet/test/servlet/TransactionScopedTestServlet.java
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import java.io.IOException; @WebServlet(name = "TransactionScopedTestServlet", urlPatterns = {"/TransactionScopedTestServlet"})
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 491e9e1..bc0c9ee 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
@@ -27,7 +27,7 @@ import java.sql.*; import java.rmi.RemoteException; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import javax.naming.*; import javax.sql.*;
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 d1a82eb..07dfa7c 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
@@ -25,7 +25,7 @@ import java.sql.*; import javax.sql.*; import jakarta.jms.*; -import javax.transaction.*; +import jakarta.transaction.*; /**
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 a655608..7d78c41 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
@@ -27,7 +27,7 @@ import java.sql.*; import java.rmi.RemoteException; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import javax.naming.*; import javax.sql.*;
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 576ce98..1d3d912 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
@@ -24,7 +24,7 @@ import java.sql.*; import javax.sql.*; import jakarta.jms.*; -import javax.transaction.*; +import jakarta.transaction.*; /**
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 c61b390..b50d7e4 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
@@ -27,7 +27,7 @@ import java.sql.*; import java.rmi.RemoteException; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import javax.naming.*; import javax.sql.*;
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 8461859..832ff77 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
@@ -24,7 +24,7 @@ import java.sql.*; import javax.sql.*; import jakarta.jms.*; -import javax.transaction.*; +import jakarta.transaction.*; /**
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 c61b390..b50d7e4 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
@@ -27,7 +27,7 @@ import java.sql.*; import java.rmi.RemoteException; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import javax.naming.*; import javax.sql.*;
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 a76aeba..8350885 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
@@ -25,7 +25,7 @@ import java.sql.*; import javax.sql.*; import jakarta.jms.*; -import javax.transaction.*; +import jakarta.transaction.*; /**
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 c61b390..b50d7e4 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
@@ -27,7 +27,7 @@ import java.sql.*; import java.rmi.RemoteException; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import javax.naming.*; import javax.sql.*;
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 8461859..832ff77 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
@@ -24,7 +24,7 @@ import java.sql.*; import javax.sql.*; import jakarta.jms.*; -import javax.transaction.*; +import jakarta.transaction.*; /**
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 31ed4db..7e06423 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
@@ -28,7 +28,7 @@ import jakarta.ejb.EJBs; import jakarta.ejb.EJBException; import jakarta.annotation.Resource; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; @EJB(name = "helloStateless3", beanInterface = Hello.class) @EJBs({@EJB(name = "helloStateless4", beanName = "HelloEJB",
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 43d59d8..4a3ff1d 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
@@ -28,7 +28,7 @@ import jakarta.ejb.EJBs; import jakarta.ejb.EJBException; import jakarta.annotation.Resource; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; @EJB(name = "helloStateless3", beanInterface = Hello.class) @EJBs({@EJB(name = "helloStateless4", beanName = "HelloEJB",
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 bbabbb3..75ebde0 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
@@ -24,7 +24,7 @@ import java.util.Properties; import java.sql.*; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import javax.naming.*; import javax.sql.*;
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 5eb4b43..6eb042f 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
@@ -24,7 +24,7 @@ import java.sql.*; import javax.sql.*; import jakarta.jms.*; -import javax.transaction.*; +import jakarta.transaction.*; /**
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 8fd15e1..e22fa10 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
@@ -24,7 +24,7 @@ import java.util.Properties; import java.sql.*; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import javax.naming.*; import javax.sql.*;
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 a1d760b..1af8def 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
@@ -26,7 +26,7 @@ import java.sql.*; import javax.sql.*; import jakarta.jms.*; -import javax.transaction.*; +import jakarta.transaction.*; /**
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 702f0d8..99bf25d 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
@@ -24,7 +24,7 @@ import java.util.Properties; import java.sql.*; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import javax.naming.*; import javax.sql.*;
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 cdf3dcb..1da02c2 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
@@ -24,7 +24,7 @@ import java.sql.*; import javax.sql.*; import jakarta.jms.*; -import javax.transaction.*; +import jakarta.transaction.*; /**
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 e5db294..9004c38 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
@@ -24,7 +24,7 @@ import java.sql.*; import javax.sql.*; import jakarta.jms.*; -import javax.transaction.*; +import jakarta.transaction.*; /**
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 e5db294..9004c38 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
@@ -24,7 +24,7 @@ import java.sql.*; import javax.sql.*; import jakarta.jms.*; -import javax.transaction.*; +import jakarta.transaction.*; /**
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 5ab2503..5232dec 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
@@ -31,7 +31,7 @@ import jakarta.ejb.EJBs; import jakarta.ejb.EJBException; import jakarta.annotation.Resource; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; @EJB(name = "helloStateless3", beanInterface = Hello.class) @EJBs({@EJB(name = "helloStateless4", beanName = "HelloEJB",
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 36759f6..b816b6d 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
@@ -31,7 +31,7 @@ import jakarta.ejb.EJBs; import jakarta.ejb.EJBException; import jakarta.annotation.Resource; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; @EJB(name = "helloStateless3", beanInterface = Hello.class) @EJBs({@EJB(name = "helloStateless4", beanName = "HelloEJB",
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 8fd15e1..e22fa10 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
@@ -24,7 +24,7 @@ import java.util.Properties; import java.sql.*; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import javax.naming.*; import javax.sql.*;
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 e5db294..9004c38 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
@@ -24,7 +24,7 @@ import java.sql.*; import javax.sql.*; import jakarta.jms.*; -import javax.transaction.*; +import jakarta.transaction.*; /**
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 071bca7..a83c924 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
@@ -24,7 +24,7 @@ import java.util.Properties; import java.sql.*; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import javax.naming.*; import javax.sql.*;
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 7283014..4bc0705 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
@@ -26,7 +26,7 @@ import java.sql.*; import javax.sql.*; import jakarta.jms.*; -import javax.transaction.*; +import jakarta.transaction.*; /**
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 071bca7..a83c924 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
@@ -24,7 +24,7 @@ import java.util.Properties; import java.sql.*; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import javax.naming.*; import javax.sql.*;
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 7283014..4bc0705 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
@@ -26,7 +26,7 @@ import java.sql.*; import javax.sql.*; import jakarta.jms.*; -import javax.transaction.*; +import jakarta.transaction.*; /**
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 67aa6c6..44d4ea5 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
@@ -31,7 +31,7 @@ import javax.servlet.annotation.*; import javax.servlet.http.*; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import jakarta.annotation.sql.*;
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 7a40e6e..2f15a45 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
@@ -25,7 +25,7 @@ import java.sql.*; import javax.sql.*; import jakarta.jms.*; -import javax.transaction.*; +import jakarta.transaction.*; /**
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 fb3f307..786600e 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
@@ -27,7 +27,7 @@ import java.sql.*; import javax.sql.*; import jakarta.jms.*; -import javax.transaction.*; +import jakarta.transaction.*; /**
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 372df6d..76f5b44 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
@@ -26,7 +26,7 @@ import java.sql.*; import java.rmi.RemoteException; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import javax.naming.*; import javax.sql.*; //import com.sun.jdbcra.spi.JdbcSetupAdmin;
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 0ec1e01..4482dd9 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
@@ -35,7 +35,7 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; @EJB(name = "helloStateless3", beanInterface = Hello.class) @EJBs({@EJB(name = "helloStateless4", beanName = "HelloEJB",
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 eb95435..5a2f110 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
@@ -32,7 +32,7 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; @EJB(name = "helloStateless3", beanInterface = Hello.class) @EJBs({@EJB(name = "helloStateless4", beanName = "HelloEJB",
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 5d6c0ac..7467c41 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
@@ -20,7 +20,7 @@ import java.util.*; import java.sql.*; import jakarta.ejb.EJB; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import jakarta.annotation.Resource; import javax.sql.DataSource; import com.sun.s1asdev.ejb.ejb30.persistence.tx_propagation.*;
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 49ebba4..3f653e3 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
@@ -24,7 +24,7 @@ import java.util.Properties; import java.sql.*; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import javax.naming.*; import javax.sql.*;
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 cdf3dcb..1da02c2 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
@@ -24,7 +24,7 @@ import java.sql.*; import javax.sql.*; import jakarta.jms.*; -import javax.transaction.*; +import jakarta.transaction.*; /**
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 c682f0a..b648e91 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
@@ -24,7 +24,7 @@ import java.util.Properties; import java.sql.*; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import javax.naming.*; import javax.sql.*;
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 1b5c5eb..3ede69c 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
@@ -25,7 +25,7 @@ import java.sql.*; import javax.sql.*; import jakarta.jms.*; -import javax.transaction.*; +import jakarta.transaction.*; /**
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 871b6e2..ac147cc 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
@@ -26,7 +26,7 @@ import java.sql.*; import java.rmi.RemoteException; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import javax.naming.*; import javax.sql.*; //import com.sun.jdbcra.spi.JdbcSetupAdmin;
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 f45baf5..39e46d0 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
@@ -31,7 +31,7 @@ import javax.naming.InitialContext; import jakarta.annotation.Resource; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import java.util.Collection; import java.util.HashSet;
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 91df6f7..b2f9ddf 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
@@ -32,7 +32,7 @@ import javax.naming.InitialContext; import jakarta.annotation.Resource; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import java.util.Collection; import java.util.HashSet;
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 a9b4afb..d2a5539 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
@@ -23,7 +23,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.Iterator; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; @Stateless
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 4a85608..5d81de3 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
@@ -27,8 +27,8 @@ import jakarta.ejb.TransactionAttributeType; import javax.naming.InitialContext; -import javax.transaction.TransactionManager; -import javax.transaction.Status; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.Status; import java.util.Collection; import java.util.Iterator;
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 00c159d..0b7e79c 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
@@ -29,7 +29,7 @@ import jakarta.annotation.Resources; import javax.sql.DataSource; import java.sql.Connection; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import org.omg.CORBA.ORB; import org.omg.PortableServer.POA;
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 0da941e..96e8069 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
@@ -29,8 +29,8 @@ import jakarta.ejb.TransactionAttributeType; import javax.naming.InitialContext; import javax.sql.DataSource; -import javax.transaction.TransactionManager; -import javax.transaction.Status; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.Status; @RunAs(value="nobody") @Stateful
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 4d8587e..b417f1e 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
@@ -28,8 +28,8 @@ import javax.enterprise.inject.spi.BeanManager; import jakarta.jms.ConnectionFactory; import javax.sql.DataSource; -import javax.transaction.UserTransaction; -import javax.transaction.TransactionSynchronizationRegistry; +import jakarta.transaction.UserTransaction; +import jakarta.transaction.TransactionSynchronizationRegistry; import jakarta.validation.ValidatorFactory; import jakarta.validation.Validator;
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 4ab6beb..149c2ca 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
@@ -25,7 +25,7 @@ import javax.naming.*; import javax.rmi.PortableRemoteObject; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import java.rmi.RemoteException;
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 d9bd214..98cc749 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
@@ -25,7 +25,7 @@ import javax.naming.*; import javax.rmi.PortableRemoteObject; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import java.rmi.RemoteException;
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 91ad222..0c801dd 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
@@ -25,7 +25,7 @@ import javax.naming.*; import javax.rmi.PortableRemoteObject; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import java.rmi.RemoteException;
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 c7c26b6..b6b78eb 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
@@ -25,7 +25,7 @@ import javax.naming.*; import javax.rmi.PortableRemoteObject; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import java.rmi.RemoteException;
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 71cb378..adcc198 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
@@ -25,7 +25,7 @@ import javax.naming.*; import javax.rmi.PortableRemoteObject; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import java.rmi.RemoteException;
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 9ac0024..253149b 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
@@ -25,7 +25,7 @@ import javax.naming.*; import javax.rmi.PortableRemoteObject; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import java.rmi.RemoteException;
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 17e540b..3a17bce 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
@@ -68,7 +68,7 @@ private int passivateCount; private int activateCount; - javax.transaction.UserTransaction ut; + jakarta.transaction.UserTransaction ut; @EJB private SlessBusiness refSless_1; @EJB private SlessBusiness refSless_2;
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 c04e8da..6c25145 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
@@ -18,8 +18,8 @@ import jakarta.ejb.*; import jakarta.annotation.Resource; -import javax.transaction.TransactionManager; -import javax.transaction.Status; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.Status; import javax.naming.InitialContext; @Stateless
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 457780f..7bf7814 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
@@ -65,7 +65,7 @@ private static final String pkey = "A BMP Bean"; - @Resource javax.transaction.UserTransaction ut; + @Resource jakarta.transaction.UserTransaction ut; @PostConstruct public void create() {
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 a527d9e..8cd7114 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
@@ -20,7 +20,7 @@ import java.util.*; import jakarta.ejb.*; import java.rmi.RemoteException; -import javax.transaction.TransactionRequiredException; +import jakarta.transaction.TransactionRequiredException; import com.sun.s1asdev.ejb.ejb30.clientview.exceptions.*; import com.sun.ejte.ccl.reporter.SimpleReporterAdapter; import javax.naming.InitialContext;
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 752648a..3707d3a 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
@@ -23,10 +23,10 @@ import java.rmi.NoSuchObjectException; import java.rmi.RemoteException; import jakarta.annotation.Resource; -import javax.transaction.TransactionRolledbackException; -import static javax.transaction.Status.*; -import javax.transaction.TransactionRequiredException; -import javax.transaction.UserTransaction; +import jakarta.transaction.TransactionRolledbackException; +import static jakarta.transaction.Status.*; +import jakarta.transaction.TransactionRequiredException; +import jakarta.transaction.UserTransaction; import jakarta.annotation.PostConstruct; @Stateful
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 0493b03..1627c4c 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
@@ -17,8 +17,8 @@ package com.sun.s1asdev.ejb.ejb30.hello.mdb2; import jakarta.ejb.*; -import javax.transaction.TransactionManager; -import javax.transaction.Status; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.Status; import javax.naming.InitialContext; public class HelloStatelessSuper {
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 7fe594b..59fffa4 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
@@ -40,8 +40,8 @@ import jakarta.jms.QueueSender; import jakarta.jms.TextMessage; import jakarta.jms.Session; -import javax.transaction.TransactionManager; -import javax.transaction.Status; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.Status; import jakarta.annotation.Resource; import java.util.Collection;
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 f45baf5..39e46d0 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
@@ -31,7 +31,7 @@ import javax.naming.InitialContext; import jakarta.annotation.Resource; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import java.util.Collection; import java.util.HashSet;
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 91df6f7..b2f9ddf 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
@@ -32,7 +32,7 @@ import javax.naming.InitialContext; import jakarta.annotation.Resource; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import java.util.Collection; import java.util.HashSet;
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 21c699c..900eed2 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
@@ -27,7 +27,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.Iterator; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; @Stateless
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 4a85608..5d81de3 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
@@ -27,8 +27,8 @@ import jakarta.ejb.TransactionAttributeType; import javax.naming.InitialContext; -import javax.transaction.TransactionManager; -import javax.transaction.Status; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.Status; import java.util.Collection; import java.util.Iterator;
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 5b5f352..cfe957f 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
@@ -20,7 +20,7 @@ import jakarta.ejb.SessionContext; import javax.naming.InitialContext; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import java.util.Collection; import java.util.HashSet;
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 26c8c37..1564863 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
@@ -20,7 +20,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.Iterator; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; public class SlessEJB {
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 3811751..9042b33 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
@@ -22,8 +22,8 @@ import jakarta.ejb.SessionContext; import javax.naming.InitialContext; -import javax.transaction.TransactionManager; -import javax.transaction.Status; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.Status; import java.util.Collection; import java.util.Iterator;
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 676f7db..7859c91 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
@@ -29,7 +29,7 @@ import jakarta.annotation.Resources; import javax.sql.DataSource; import java.sql.Connection; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import org.omg.CORBA.ORB; import org.omg.PortableServer.POA;
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 3e7d70c..5c0b234 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
@@ -20,7 +20,7 @@ import java.util.*; import java.sql.*; import jakarta.ejb.EJB; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import jakarta.annotation.Resource; import javax.sql.DataSource; import com.sun.s1asdev.ejb.ejb30.persistence.tx_propagation.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/FooNonManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/FooNonManagedBean.java index 19f76ce..09dcb22 100644 --- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/FooNonManagedBean.java +++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/FooNonManagedBean.java
@@ -20,7 +20,7 @@ import jakarta.annotation.PreDestroy; import jakarta.annotation.Resource; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; public class FooNonManagedBean {
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 4a771fa..010f5ab 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
@@ -20,7 +20,7 @@ import jakarta.ejb.EJB; import jakarta.annotation.Resource; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import jakarta.persistence.PersistenceContext; import jakarta.persistence.EntityManager;
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 9179563..cceb79f 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
@@ -20,7 +20,7 @@ import jakarta.ejb.EJB; import jakarta.annotation.Resource; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import jakarta.persistence.PersistenceContext; import jakarta.persistence.EntityManager;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/FooNonManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/FooNonManagedBean.java index f35d1ab..94ffc96 100644 --- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/FooNonManagedBean.java +++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/FooNonManagedBean.java
@@ -21,7 +21,7 @@ import jakarta.annotation.Resource; import org.omg.CORBA.ORB; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; public class FooNonManagedBean {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/SingletonBean2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/SingletonBean2.java index bfbc16b..49c0b6e 100644 --- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/SingletonBean2.java +++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/SingletonBean2.java
@@ -24,8 +24,8 @@ System.out.println("In SingletonBean2::init()"); try { javax.naming.InitialContext ic = new javax.naming.InitialContext(); - javax.transaction.TransactionSynchronizationRegistry tr = - (javax.transaction.TransactionSynchronizationRegistry) + jakarta.transaction.TransactionSynchronizationRegistry tr = + (jakarta.transaction.TransactionSynchronizationRegistry) ic.lookup("java:comp/TransactionSynchronizationRegistry"); System.out.println("In SingletonBean2::init() tx status: " + tr.getTransactionStatus()); initTx = tr.getTransactionStatus();
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 3faf72b..17af94f 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
@@ -18,7 +18,7 @@ import jakarta.ejb.*; import jakarta.annotation.*; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; @Singleton //@Startup
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 752e52b..61b72f1 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
@@ -100,9 +100,9 @@ public void destroy() { System.out.println("In SingletonBean::destroy()"); try { - javax.transaction.TransactionSynchronizationRegistry r = (javax.transaction.TransactionSynchronizationRegistry) + jakarta.transaction.TransactionSynchronizationRegistry r = (jakarta.transaction.TransactionSynchronizationRegistry) new InitialContext().lookup("java:comp/TransactionSynchronizationRegistry"); - if (r.getTransactionStatus() != javax.transaction.Status.STATUS_ACTIVE) { + if (r.getTransactionStatus() != jakarta.transaction.Status.STATUS_ACTIVE) { throw new IllegalStateException("Transaction status is not STATUS_ACTIVE: " + r.getTransactionStatus()); } FooEntity fe = new FooEntity("FOO");
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 45b6fea..23b1799 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
@@ -61,13 +61,13 @@ private boolean validate(boolean op) { boolean valid = true; try { - javax.transaction.TransactionSynchronizationRegistry r = (javax.transaction.TransactionSynchronizationRegistry) + jakarta.transaction.TransactionSynchronizationRegistry r = (jakarta.transaction.TransactionSynchronizationRegistry) new javax.naming.InitialContext().lookup("java:comp/TransactionSynchronizationRegistry"); System.out.println("========> TX Status for " + op + " : " + r.getTransactionStatus()); - if (op && r.getTransactionStatus() != javax.transaction.Status.STATUS_ACTIVE) { + if (op && r.getTransactionStatus() != jakarta.transaction.Status.STATUS_ACTIVE) { System.out.println("ERROR: NON-Active transaction"); valid = false; - } else if (!op && r.getTransactionStatus() == javax.transaction.Status.STATUS_ACTIVE) { + } else if (!op && r.getTransactionStatus() == jakarta.transaction.Status.STATUS_ACTIVE) { System.out.println("ERROR: Active transaction"); valid = false; }
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/mdb/ra/CommandResourceAdapter.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/mdb/ra/CommandResourceAdapter.java index 0ed9298..2cd2254 100644 --- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/mdb/ra/CommandResourceAdapter.java +++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/mdb/ra/CommandResourceAdapter.java
@@ -23,7 +23,7 @@ import jakarta.resource.spi.ResourceAdapterInternalException; import jakarta.resource.spi.endpoint.MessageEndpoint; import jakarta.resource.spi.endpoint.MessageEndpointFactory; -import javax.transaction.xa.XAResource; +import jakarta.transaction.xa.XAResource; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.HashMap;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/ejb/Verifier.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/ejb/Verifier.java index 4843767..6513a9c 100644 --- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/ejb/Verifier.java +++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/ejb/Verifier.java
@@ -22,13 +22,13 @@ static boolean verify_tx(boolean op) { boolean valid = true; try { - javax.transaction.TransactionSynchronizationRegistry r = (javax.transaction.TransactionSynchronizationRegistry) + jakarta.transaction.TransactionSynchronizationRegistry r = (jakarta.transaction.TransactionSynchronizationRegistry) new javax.naming.InitialContext().lookup("java:comp/TransactionSynchronizationRegistry"); System.out.println("========> TX Status for " + op + " : " + r.getTransactionStatus()); - if (op && r.getTransactionStatus() != javax.transaction.Status.STATUS_ACTIVE) { + if (op && r.getTransactionStatus() != jakarta.transaction.Status.STATUS_ACTIVE) { System.out.println("ERROR: NON-Active transaction"); valid = false; - } else if (!op && r.getTransactionStatus() == javax.transaction.Status.STATUS_ACTIVE) { + } else if (!op && r.getTransactionStatus() == jakarta.transaction.Status.STATUS_ACTIVE) { System.out.println("ERROR: Active transaction"); valid = false; }
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 497aa92..138d1cb 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
@@ -22,7 +22,7 @@ import jakarta.persistence.EntityManager; import jakarta.persistence.PersistenceContext; import jakarta.persistence.SynchronizationType; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; @Stateless @TransactionManagement(TransactionManagementType.BEAN)
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 d2bc8ee..eb6578b 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
@@ -28,7 +28,7 @@ import jakarta.ejb.TransactionManagementType; import javax.naming.InitialContext; import javax.sql.DataSource; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; @Stateless @EJB(name="ejb/SfulBean",
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 faaa175..a996a05 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
@@ -61,9 +61,9 @@ public void destroy() { System.out.println("In SFSB::destroy()"); try { - javax.transaction.TransactionSynchronizationRegistry r = (javax.transaction.TransactionSynchronizationRegistry) + jakarta.transaction.TransactionSynchronizationRegistry r = (jakarta.transaction.TransactionSynchronizationRegistry) new InitialContext().lookup("java:comp/TransactionSynchronizationRegistry"); - if (r.getTransactionStatus() != javax.transaction.Status.STATUS_ACTIVE) { + if (r.getTransactionStatus() != jakarta.transaction.Status.STATUS_ACTIVE) { throw new IllegalStateException("Transaction status is not STATUS_ACTIVE: " + r.getTransactionStatus()); } FooEntity fe = new FooEntity("FOO");
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 e06936c..a74ef21 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
@@ -53,9 +53,9 @@ public void destroy() { System.out.println("In SFSB::destroy()"); try { - javax.transaction.TransactionSynchronizationRegistry r = (javax.transaction.TransactionSynchronizationRegistry) + jakarta.transaction.TransactionSynchronizationRegistry r = (jakarta.transaction.TransactionSynchronizationRegistry) new InitialContext().lookup("java:comp/TransactionSynchronizationRegistry"); - if (r.getTransactionStatus() != javax.transaction.Status.STATUS_ACTIVE) { + if (r.getTransactionStatus() != jakarta.transaction.Status.STATUS_ACTIVE) { throw new IllegalStateException("Transaction status is not STATUS_ACTIVE: " + r.getTransactionStatus()); } FooEntity fe = new FooEntity("FOO");
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 6feac86..13ad328 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
@@ -19,7 +19,7 @@ import jakarta.ejb.MessageDrivenContext; import javax.naming.Context; import javax.naming.InitialContext; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; /** * Tests matrix of operations callable from the different
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 5a8aac5..28b022a 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
@@ -40,7 +40,7 @@ private long overhead; - javax.transaction.UserTransaction ut; + jakarta.transaction.UserTransaction ut; public HelloEJB(){}
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 2c8ccc9..993be3c 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
@@ -37,7 +37,7 @@ private long overhead; - javax.transaction.UserTransaction ut; + jakarta.transaction.UserTransaction ut; public HelloEJB(){}
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 5298e37..10ce354 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
@@ -25,7 +25,7 @@ import javax.naming.*; import javax.rmi.PortableRemoteObject; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import java.rmi.RemoteException;
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 139b5bd..6f06dec 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
@@ -25,7 +25,7 @@ import javax.naming.*; import javax.rmi.PortableRemoteObject; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import java.rmi.RemoteException;
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 6bbbc9a..838a5af 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
@@ -25,7 +25,7 @@ import javax.naming.*; import javax.rmi.PortableRemoteObject; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import java.rmi.RemoteException;
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 a3c0f2a..8c22956 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
@@ -208,7 +208,7 @@ boolean gotException = false; // Test BMT SFSB remove called in a transaction - javax.transaction.UserTransaction ut = (javax.transaction.UserTransaction) + jakarta.transaction.UserTransaction ut = (jakarta.transaction.UserTransaction) (new InitialContext()).lookup("java:comp/UserTransaction"); ut.begin(); sfsb.remove();
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 5a1bf55..df1a46d 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
@@ -25,7 +25,7 @@ import javax.naming.*; import javax.rmi.PortableRemoteObject; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import java.rmi.RemoteException;
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 6bbbc9a..838a5af 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
@@ -25,7 +25,7 @@ import javax.naming.*; import javax.rmi.PortableRemoteObject; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import java.rmi.RemoteException;
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 1b75a9c..63d8721 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
@@ -25,7 +25,7 @@ import javax.naming.*; import javax.rmi.PortableRemoteObject; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import java.rmi.RemoteException;
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 6a8627e..4896ffa 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
@@ -45,7 +45,7 @@ private static final String pkey = "A BMP Bean"; - javax.transaction.UserTransaction ut; + jakarta.transaction.UserTransaction ut; public HelloEJB(){}
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 05982de..ef751dd 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
@@ -26,7 +26,7 @@ import jakarta.ejb.TimerService; import javax.naming.*; import javax.rmi.PortableRemoteObject; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import com.sun.s1asdev.ejb.txprop.simple.HelloHome; import com.sun.s1asdev.ejb.txprop.simple.Hello;
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 a05a977..ca2537f 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
@@ -117,7 +117,7 @@ public void helloOneWay(String s1) { - javax.transaction.TransactionManager tm = + jakarta.transaction.TransactionManager tm = com.sun.enterprise.Switch.getSwitch().getTransactionManager(); int txStatus = -1; try { @@ -137,7 +137,7 @@ // we were invoked through a webserivce invocation. there // shouldn't be a transaction. - if( txStatus == javax.transaction.Status.STATUS_NO_TRANSACTION) { + if( txStatus == jakarta.transaction.Status.STATUS_NO_TRANSACTION) { System.out.println("Correctly found no tx for helloOneWay " + " invoked through a webservice"); } else { @@ -149,7 +149,7 @@ // since there's no WEB service message context, we were // invoked through a remote invocation. - if( txStatus == javax.transaction.Status.STATUS_ACTIVE) { + if( txStatus == jakarta.transaction.Status.STATUS_ACTIVE) { System.out.println("Correctly found an active tx for " + "helloOneWay invoked through a Remote interface"); } else {
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 9c67853..81e154a 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
@@ -22,7 +22,7 @@ import java.rmi.*; import java.util.*; import java.sql.*; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; public class SimpleSession2Bean implements SessionBean {
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 1621b2b..180d9ad 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
@@ -23,7 +23,7 @@ import java.sql.*; import java.util.Set; import java.util.HashSet; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; @Stateless public class SimpleSessionBean implements SessionBean {
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 3df9a79..062ebe2 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
@@ -22,7 +22,7 @@ import java.rmi.*; import java.util.*; import java.sql.*; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; public class SimpleSession2Bean implements SessionBean {
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 0579802..1c12088 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
@@ -22,7 +22,7 @@ import java.rmi.*; import java.util.*; import java.sql.*; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; public class SimpleSessionBean implements SessionBean {
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 d70b434..619ff8c 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
@@ -20,7 +20,7 @@ import java.io.*; import java.rmi.*; import jakarta.ejb.*; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import javax.naming.*; import javax.sql.*; import java.sql.*;
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 c9d3d0a..3e6c8b9 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
@@ -20,7 +20,7 @@ import java.io.*; import java.rmi.*; import jakarta.ejb.*; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import javax.naming.*; import javax.sql.*; import java.sql.*;
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 fc8fba0..a510de4 100644 --- a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/ejb/SimpleSession2Bean.java +++ b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/ejb/SimpleSession2Bean.java
@@ -22,7 +22,7 @@ import java.rmi.*; import java.util.*; import java.sql.*; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; public class SimpleSession2Bean implements SessionBean {
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 7dbae30..00ef7d0 100644 --- a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/ejb/SimpleSessionBean.java +++ b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/ejb/SimpleSessionBean.java
@@ -22,7 +22,7 @@ import java.sql.*; import java.util.Set; import java.util.HashSet; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; public class SimpleSessionBean implements SessionBean {
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 0325651..1e0db90 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
@@ -22,8 +22,8 @@ import java.rmi.*; import java.util.*; import java.sql.*; -import javax.transaction.SystemException; -import javax.transaction.UserTransaction; +import jakarta.transaction.SystemException; +import jakarta.transaction.UserTransaction; public class SimpleSessionBean implements SessionBean {
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 91f0b22..2e0f3f2 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
@@ -22,7 +22,7 @@ import java.rmi.*; import java.util.*; import java.sql.*; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import java.util.concurrent.*; import java.lang.reflect.Method;
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 b1ac27a..d494fdc 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
@@ -20,7 +20,7 @@ import java.util.*; import java.sql.*; import jakarta.ejb.EJB; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import jakarta.annotation.*; import jakarta.annotation.sql.*; import javax.sql.DataSource;
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 99f6fcc..6d6a7d1 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
@@ -20,7 +20,7 @@ import java.io.*; import java.rmi.*; import jakarta.ejb.*; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import javax.naming.*; import javax.sql.*; import java.sql.*;
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 0f15ddc..61c3b0f 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
@@ -20,7 +20,7 @@ import java.io.*; import java.rmi.*; import jakarta.ejb.*; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import javax.naming.*; import javax.sql.*; import java.sql.*;
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 afbd45b..d23d6f5 100644 --- a/appserver/tests/appserv-tests/devtests/jdbc/notxops/ejb/SimpleSessionBean.java +++ b/appserver/tests/appserv-tests/devtests/jdbc/notxops/ejb/SimpleSessionBean.java
@@ -22,7 +22,7 @@ import java.rmi.*; import java.util.*; import java.sql.*; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; public class SimpleSessionBean implements SessionBean {
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 46551cb..a5b7c20 100644 --- a/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnection/ejb/NoTxConnTestBean.java +++ b/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnection/ejb/NoTxConnTestBean.java
@@ -20,7 +20,7 @@ import java.io.*; import java.rmi.*; import jakarta.ejb.*; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import javax.naming.*; import javax.sql.*; import java.sql.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnectionservlet/servlet/OnlyGetConnectionServlet.java b/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnectionservlet/servlet/OnlyGetConnectionServlet.java index 0d36c21..afdb0a6 100644 --- a/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnectionservlet/servlet/OnlyGetConnectionServlet.java +++ b/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnectionservlet/servlet/OnlyGetConnectionServlet.java
@@ -18,7 +18,7 @@ import javax.servlet.*; import javax.servlet.http.*; -import javax.transaction.*; +import jakarta.transaction.*; import javax.sql.*; import java.sql.*; import java.io.*;
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 3304046..8688975 100644 --- a/appserver/tests/appserv-tests/devtests/jdbc/pooling/ejb/SimpleSessionBean.java +++ b/appserver/tests/appserv-tests/devtests/jdbc/pooling/ejb/SimpleSessionBean.java
@@ -22,8 +22,8 @@ import java.rmi.*; import java.util.*; import java.sql.*; -import javax.transaction.SystemException; -import javax.transaction.UserTransaction; +import jakarta.transaction.SystemException; +import jakarta.transaction.UserTransaction; public class SimpleSessionBean implements SessionBean {
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/switchoffACCconnpooling/client/Client.java b/appserver/tests/appserv-tests/devtests/jdbc/switchoffACCconnpooling/client/Client.java index f525f36..960771e 100644 --- a/appserver/tests/appserv-tests/devtests/jdbc/switchoffACCconnpooling/client/Client.java +++ b/appserver/tests/appserv-tests/devtests/jdbc/switchoffACCconnpooling/client/Client.java
@@ -32,8 +32,8 @@ import javax.naming.NamingException; import javax.sql.DataSource; import java.sql.Connection; -import javax.transaction.SystemException; -import javax.transaction.UserTransaction; +import jakarta.transaction.SystemException; +import jakarta.transaction.UserTransaction; import java.util.HashSet; import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
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 b2d9ed5..4e428b6 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
@@ -20,7 +20,7 @@ import java.io.*; import java.rmi.*; import jakarta.ejb.*; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import javax.naming.*; import javax.sql.*; import java.sql.*;
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 41c2463..9542700 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
@@ -20,7 +20,7 @@ import java.io.*; import java.rmi.*; import jakarta.ejb.*; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import javax.naming.*; import javax.sql.*; import java.sql.*;
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 1f67dbc..90bfeeb 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
@@ -20,7 +20,7 @@ import java.io.*; import java.rmi.*; import jakarta.ejb.*; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import javax.naming.*; import javax.sql.*; import java.sql.*;
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 bb72d3e..3c98e03 100644 --- a/appserver/tests/appserv-tests/devtests/jdbc/txStress/ejb/EnrollerBean.java +++ b/appserver/tests/appserv-tests/devtests/jdbc/txStress/ejb/EnrollerBean.java
@@ -20,7 +20,7 @@ import jakarta.ejb.*; import java.sql.*; import javax.sql.*; -import javax.transaction.*; +import jakarta.transaction.*; import java.util.*; import javax.naming.*;
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 acbd1be..80d2028 100644 --- a/appserver/tests/appserv-tests/devtests/jdbc/txafternontx/ejb/SimpleSessionBean.java +++ b/appserver/tests/appserv-tests/devtests/jdbc/txafternontx/ejb/SimpleSessionBean.java
@@ -22,7 +22,7 @@ import java.rmi.*; import java.util.*; import java.sql.*; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; public class SimpleSessionBean implements SessionBean {
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 c1d7f18..2ab67bc 100644 --- a/appserver/tests/appserv-tests/devtests/jdbc/txafternontxjndi/ejb/SimpleSessionBean.java +++ b/appserver/tests/appserv-tests/devtests/jdbc/txafternontxjndi/ejb/SimpleSessionBean.java
@@ -22,7 +22,7 @@ import java.rmi.*; import java.util.*; import java.sql.*; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; public class SimpleSessionBean implements SessionBean {
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 bc9f8a3..7405512 100644 --- a/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/NoTxConnTestBean.java +++ b/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/NoTxConnTestBean.java
@@ -20,7 +20,7 @@ import java.io.*; import java.rmi.*; import jakarta.ejb.*; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import javax.naming.*; import javax.sql.*; import java.sql.*;
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 383e3f2..55ed061 100644 --- a/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/SecondBean.java +++ b/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/SecondBean.java
@@ -20,7 +20,7 @@ import java.io.*; import java.rmi.*; import jakarta.ejb.*; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import javax.naming.*; import javax.sql.*; import java.sql.*;
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 6678aee..2cbd2b2 100644 --- a/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/ThirdBean.java +++ b/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/ThirdBean.java
@@ -20,7 +20,7 @@ import java.io.*; import java.rmi.*; import jakarta.ejb.*; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import javax.naming.*; import javax.sql.*; import java.sql.*;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/AssocWithThreadTest.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/AssocWithThreadTest.java index b530638..a30256e 100644 --- a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/AssocWithThreadTest.java +++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/AssocWithThreadTest.java
@@ -29,7 +29,7 @@ import java.util.Map; import javax.naming.InitialContext; import javax.sql.DataSource; -import javax.transaction.SystemException; +import jakarta.transaction.SystemException; import org.glassfish.jdbc.devtests.v3.util.HtmlUtil; /**
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/ConnectionSharingTest.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/ConnectionSharingTest.java index 1cd61a1..caf3f9d 100644 --- a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/ConnectionSharingTest.java +++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/ConnectionSharingTest.java
@@ -24,7 +24,7 @@ import java.util.Map; import javax.naming.InitialContext; import javax.sql.DataSource; -import javax.transaction.SystemException; +import jakarta.transaction.SystemException; import org.glassfish.jdbc.devtests.v3.util.HtmlUtil; /** @@ -60,11 +60,11 @@ ResultSet rs = null; out.println("<h4> connection-sharing test </h4>"); - javax.transaction.UserTransaction ut = null; + jakarta.transaction.UserTransaction ut = null; try { out.println("<br>Starting test ..."); InitialContext ic = new InitialContext(); - ut = (javax.transaction.UserTransaction) ic.lookup("java:comp/UserTransaction"); + ut = (jakarta.transaction.UserTransaction) ic.lookup("java:comp/UserTransaction"); out.println("<br>Able to lookup UserTransaction"); ut.begin(); out.println("<br> Started UserTransaction");
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/LazyConnectionAssociationTest.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/LazyConnectionAssociationTest.java index 3b3f53f..29f7847 100644 --- a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/LazyConnectionAssociationTest.java +++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/LazyConnectionAssociationTest.java
@@ -24,7 +24,7 @@ import java.util.Map; import javax.naming.InitialContext; import javax.sql.DataSource; -import javax.transaction.SystemException; +import jakarta.transaction.SystemException; import org.glassfish.jdbc.devtests.v3.util.HtmlUtil; /**
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/LazyConnectionEnlistmentTest.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/LazyConnectionEnlistmentTest.java index a87746a..8173bcf 100644 --- a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/LazyConnectionEnlistmentTest.java +++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/LazyConnectionEnlistmentTest.java
@@ -27,7 +27,7 @@ import java.util.Map; import javax.naming.InitialContext; import javax.sql.DataSource; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import org.glassfish.jdbc.devtests.v3.util.HtmlUtil; /**
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/NoTxConnTest.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/NoTxConnTest.java index 8bd7a45..c606ab3 100644 --- a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/NoTxConnTest.java +++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/NoTxConnTest.java
@@ -24,7 +24,7 @@ import java.util.Map; import javax.naming.InitialContext; import javax.sql.DataSource; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import org.glassfish.jdbc.devtests.v3.util.HtmlUtil; import org.glassfish.jdbc.devtests.v3.util.TablesUtil; @@ -159,7 +159,7 @@ Connection noTxConn = null; out.println("<h4> NoTxConn Test2 </h4>"); - javax.transaction.UserTransaction tx = null; + jakarta.transaction.UserTransaction tx = null; try { out.println("<br>Starting test ...");
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/SimpleXATest.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/SimpleXATest.java index 6d01fd3..4e43dfe 100755 --- a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/SimpleXATest.java +++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/SimpleXATest.java
@@ -29,7 +29,7 @@ import java.util.Map; import javax.naming.InitialContext; import javax.sql.DataSource; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import org.glassfish.jdbc.devtests.v3.util.HtmlUtil; import org.glassfish.jdbc.devtests.v3.util.TablesUtil;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/UserTxTest.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/UserTxTest.java index 1f119bc..d4e8c7f 100644 --- a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/UserTxTest.java +++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/UserTxTest.java
@@ -24,7 +24,7 @@ import java.util.Map; import javax.naming.InitialContext; import javax.sql.DataSource; -import javax.transaction.SystemException; +import jakarta.transaction.SystemException; import org.glassfish.jdbc.devtests.v3.util.HtmlUtil; import org.glassfish.jdbc.devtests.v3.util.TablesUtil; @@ -75,10 +75,10 @@ TablesUtil.createTables(ds1, out, tableName, columnName); out.println("<h4> user-tx-rollback test </h4>"); - javax.transaction.UserTransaction ut = null; + jakarta.transaction.UserTransaction ut = null; try { InitialContext ic = new InitialContext(); - ut = (javax.transaction.UserTransaction) ic.lookup("java:comp/UserTransaction"); + ut = (jakarta.transaction.UserTransaction) ic.lookup("java:comp/UserTransaction"); out.println("<br>Able to lookup UserTransaction"); ut.begin(); out.println("<br>"); @@ -149,10 +149,10 @@ TablesUtil.createTables(ds1, out, tableName, columnName); out.println("<h4> user-tx-commit test </h4>"); - javax.transaction.UserTransaction ut = null; + jakarta.transaction.UserTransaction ut = null; try { InitialContext ic = new InitialContext(); - ut = (javax.transaction.UserTransaction) ic.lookup("java:comp/UserTransaction"); + ut = (jakarta.transaction.UserTransaction) ic.lookup("java:comp/UserTransaction"); out.println("<br>Able to lookup UserTransaction"); ut.begin(); out.println("<br>");
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/reconfig/ReconfigTestUtil.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/reconfig/ReconfigTestUtil.java index 81358fd..333281f 100644 --- a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/reconfig/ReconfigTestUtil.java +++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/reconfig/ReconfigTestUtil.java
@@ -28,7 +28,7 @@ import java.util.HashMap; import java.util.Map; import javax.sql.DataSource; -import javax.transaction.SystemException; +import jakarta.transaction.SystemException; import org.glassfish.jdbc.devtests.v3.util.HtmlUtil; /**
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 a3a7515..5d8b8ee 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
@@ -26,7 +26,7 @@ import javax.inject.Inject; import jakarta.jms.*; import jakarta.ejb.*; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; /** *
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspTransactionScoped/servlet/test/JmsTagHandler.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspTransactionScoped/servlet/test/JmsTagHandler.java index 6efecf3..658bdc2 100644 --- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspTransactionScoped/servlet/test/JmsTagHandler.java +++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspTransactionScoped/servlet/test/JmsTagHandler.java
@@ -26,7 +26,7 @@ import javax.servlet.jsp.JspException; import javax.servlet.jsp.JspWriter; import javax.servlet.jsp.tagext.TagSupport; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; /** *
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletTransactionScoped/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletTransactionScoped/servlet/test/TestServlet.java index c2452b5..0210dfd 100644 --- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletTransactionScoped/servlet/test/TestServlet.java +++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletTransactionScoped/servlet/test/TestServlet.java
@@ -22,7 +22,7 @@ import jakarta.jms.*; import javax.servlet.*; import javax.servlet.http.*; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; public class TestServlet extends HttpServlet { @Resource(mappedName = "jms/jms_unit_test_Queue")
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsTransactionScoped/servlet/test/NewWebService.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsTransactionScoped/servlet/test/NewWebService.java index 64306af..7f41259 100644 --- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsTransactionScoped/servlet/test/NewWebService.java +++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsTransactionScoped/servlet/test/NewWebService.java
@@ -26,7 +26,7 @@ import jakarta.jws.WebService; import jakarta.jws.WebMethod; import jakarta.jws.WebParam; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; /** *
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 851398b..4b9fefa 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
@@ -20,7 +20,7 @@ import jakarta.ejb.*; import javax.inject.Inject; import jakarta.jms.*; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; /**
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 26d79e6..01606d6 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
@@ -20,7 +20,7 @@ import jakarta.ejb.*; import javax.inject.Inject; import jakarta.jms.*; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; /**
diff --git a/appserver/tests/appserv-tests/devtests/jms/msgdest/jmsweb/servlet/JmsServlet.java b/appserver/tests/appserv-tests/devtests/jms/msgdest/jmsweb/servlet/JmsServlet.java index 3be067d..e5dadc0 100644 --- a/appserver/tests/appserv-tests/devtests/jms/msgdest/jmsweb/servlet/JmsServlet.java +++ b/appserver/tests/appserv-tests/devtests/jms/msgdest/jmsweb/servlet/JmsServlet.java
@@ -24,7 +24,7 @@ import java.sql.*; import javax.sql.*; import jakarta.jms.*; -import javax.transaction.*; +import jakarta.transaction.*; public class JmsServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgWarTest/src/web/JpaServlet.java b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgWarTest/src/web/JpaServlet.java index 39a19dc..38a0fe5 100755 --- a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgWarTest/src/web/JpaServlet.java +++ b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgWarTest/src/web/JpaServlet.java
@@ -26,7 +26,7 @@ import java.io.*; import jakarta.persistence.*; -import javax.transaction.*; +import jakarta.transaction.*; import jakarta.annotation.*; import entity.*;
diff --git a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgWarTest1/src/web/JpaServlet.java b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgWarTest1/src/web/JpaServlet.java index 05f3af9..ed9d893 100755 --- a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgWarTest1/src/web/JpaServlet.java +++ b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgWarTest1/src/web/JpaServlet.java
@@ -26,7 +26,7 @@ import java.io.*; import jakarta.persistence.*; -import javax.transaction.*; +import jakarta.transaction.*; import jakarta.annotation.*; import entity.*;
diff --git a/appserver/tests/appserv-tests/devtests/persistence/util/ServletUtil.java b/appserver/tests/appserv-tests/devtests/persistence/util/ServletUtil.java index 2dbd103..9b21009 100755 --- a/appserver/tests/appserv-tests/devtests/persistence/util/ServletUtil.java +++ b/appserver/tests/appserv-tests/devtests/persistence/util/ServletUtil.java
@@ -22,7 +22,7 @@ import java.io.*; import jakarta.persistence.*; -import javax.transaction.*; +import jakarta.transaction.*; import jakarta.annotation.*; import java.lang.reflect.InvocationTargetException;
diff --git a/appserver/tests/appserv-tests/devtests/security/cplogin/client/ConverterClient.java b/appserver/tests/appserv-tests/devtests/security/cplogin/client/ConverterClient.java index 698a80e..da51275 100644 --- a/appserver/tests/appserv-tests/devtests/security/cplogin/client/ConverterClient.java +++ b/appserver/tests/appserv-tests/devtests/security/cplogin/client/ConverterClient.java
@@ -21,7 +21,7 @@ import javax.naming.Context; import javax.naming.InitialContext; import javax.rmi.PortableRemoteObject; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import com.sun.appserv.security.*; import com.sun.devtest.security.plogin.converter.ejb.*;
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 f4d3366..aeca033 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
@@ -21,7 +21,7 @@ import javax.naming.Context; import javax.naming.InitialContext; import javax.rmi.PortableRemoteObject; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import java.rmi.RemoteException; import com.sun.s1peqe.transaction.txlao.ejb.beanB.*;
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 9469fdb..9009d47 100755 --- a/appserver/tests/appserv-tests/devtests/transaction/txnegative/client/Client.java +++ b/appserver/tests/appserv-tests/devtests/transaction/txnegative/client/Client.java
@@ -24,7 +24,7 @@ import javax.naming.*; import javax.rmi.PortableRemoteObject; import com.sun.ejte.ccl.reporter.SimpleReporterAdapter; -import javax.transaction.*; +import jakarta.transaction.*; public class Client { public SimpleReporterAdapter status;
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 f3c6416..c3f8fff 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
@@ -21,7 +21,7 @@ import javax.naming.Context; import javax.naming.InitialContext; import javax.rmi.PortableRemoteObject; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import java.rmi.RemoteException; import com.sun.s1peqe.transaction.txstress.ejb.beanB.*;
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 2fefbf3..debe2f6 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
@@ -20,7 +20,7 @@ import jakarta.ejb.SessionContext; import java.sql.Statement; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import java.sql.Connection; import javax.sql.DataSource; import javax.naming.Context;
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 5d89baa..d698f5b 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
@@ -21,7 +21,7 @@ import javax.naming.Context; import javax.naming.InitialContext; import javax.rmi.PortableRemoteObject; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import java.rmi.RemoteException; import com.sun.s1peqe.transaction.txstressreadonly.ejb.beanB.*;
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 5031cb8..85324b7 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
@@ -21,7 +21,7 @@ import java.sql.Statement; import java.sql.ResultSet; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import java.sql.Connection; import javax.sql.DataSource; import javax.naming.Context;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/client/Client.java index 93d1a52..66ddd09 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/client/Client.java +++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/client/Client.java
@@ -40,7 +40,7 @@ public class Client { @Resource - static javax.transaction.UserTransaction ut; + static jakarta.transaction.UserTransaction ut; public static final int TIME_OUT = 1000 * 60;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/webclient/client/Client.java index 07ecc03..6a56210 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/webclient/client/Client.java +++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/webclient/client/Client.java
@@ -19,7 +19,7 @@ import javax.servlet.*; import javax.servlet.http.*; import javax.naming.InitialContext; -import javax.transaction.UserTransaction; +import jakarta.transaction.UserTransaction; import java.io.IOException; import java.io.PrintWriter;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/webclient/client/Client.java index 9b909da..23b01cf 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/webclient/client/Client.java +++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/webclient/client/Client.java
@@ -20,8 +20,8 @@ import javax.servlet.*; import javax.servlet.http.*; import javax.naming.InitialContext; -import javax.transaction.UserTransaction; -import javax.transaction.Status; +import jakarta.transaction.UserTransaction; +import jakarta.transaction.Status; import java.io.IOException; import java.io.PrintWriter; import java.sql.*;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/webclient/client/Client.java index 3810e91..a22426d 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/webclient/client/Client.java +++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/webclient/client/Client.java
@@ -20,8 +20,8 @@ import javax.servlet.*; import javax.servlet.http.*; import javax.naming.InitialContext; -import javax.transaction.UserTransaction; -import javax.transaction.Status; +import jakarta.transaction.UserTransaction; +import jakarta.transaction.Status; import java.io.IOException; import java.io.PrintWriter; import java.sql.*;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/webclient/client/Client.java index e4fd345..21d02cf 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/webclient/client/Client.java +++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/webclient/client/Client.java
@@ -20,8 +20,8 @@ import javax.servlet.*; import javax.servlet.http.*; import javax.naming.InitialContext; -import javax.transaction.UserTransaction; -import javax.transaction.Status; +import jakarta.transaction.UserTransaction; +import jakarta.transaction.Status; import java.io.IOException; import java.io.PrintWriter; import java.sql.*;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/webclient/client/Client.java index 196f116..1dc41ca 100644 --- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/webclient/client/Client.java +++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/webclient/client/Client.java
@@ -20,8 +20,8 @@ import javax.servlet.*; import javax.servlet.http.*; import javax.naming.InitialContext; -import javax.transaction.UserTransaction; -import javax.transaction.Status; +import jakarta.transaction.UserTransaction; +import jakarta.transaction.Status; import java.io.IOException; import java.io.PrintWriter; import java.sql.*;