Fixes #22895 Incorporate Jakarta Messaging 3.0.0-RC1

Signed-off-by: Gaurav Gupta <gaurav.gupta@payara.fish>

appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/client/Client.java
index 75bc6a4..b1f91aa 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/client/Client.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -16,14 +16,10 @@
 
 package com.sun.s1asdev.ejb.bmp.txtests.stateless.client;
 
-import java.util.ArrayList;
-
-import java.io.Serializable;
 import javax.naming.*;
-import javax.jms.*;
+import jakarta.jms.*;
 import javax.ejb.*;
 import javax.rmi.PortableRemoteObject;
-import java.rmi.NoSuchObjectException;
 
 import com.sun.s1asdev.ejb.bmp.txtests.stateless.ejb.SLSBHome;
 import com.sun.s1asdev.ejb.bmp.txtests.stateless.ejb.SLSB;

appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/client/Client.java
index 3e1cfe9..2c55c94 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/client/Client.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -16,18 +16,12 @@
 
 package com.sun.s1asdev.ejb.ee.methodcheckpoint.multi.client;
 
-import java.util.ArrayList;
-
-import java.io.Serializable;
 import javax.naming.*;
-import javax.jms.*;
+import jakarta.jms.*;
 import javax.ejb.*;
 import javax.rmi.PortableRemoteObject;
-import java.rmi.NoSuchObjectException;
-
 import com.sun.s1asdev.ejb.ee.ejb.SFSBHome;
 import com.sun.s1asdev.ejb.ee.ejb.SFSB;
-
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
 
 public class Client {

appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/client/Client.java
index bdf278b..fdba62a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/client/Client.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -16,14 +16,10 @@
 
 package com.sun.s1asdev.ejb.ee.methodcheckpoint.simple.client;
 
-import java.util.ArrayList;
-
-import java.io.Serializable;
 import javax.naming.*;
-import javax.jms.*;
+import jakarta.jms.*;
 import javax.ejb.*;
 import javax.rmi.PortableRemoteObject;
-import java.rmi.NoSuchObjectException;
 
 import com.sun.s1asdev.ejb.ee.ejb.SFSBHome;
 import com.sun.s1asdev.ejb.ee.ejb.SFSB;

appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/client/Client.java
index 5e1db68..a601ace 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/client/Client.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -16,14 +16,10 @@
 
 package com.sun.s1asdev.ejb.ee.client;
 
-import java.util.ArrayList;
-
-import java.io.Serializable;
 import javax.naming.*;
-import javax.jms.*;
+import jakarta.jms.*;
 import javax.ejb.*;
 import javax.rmi.PortableRemoteObject;
-import java.rmi.NoSuchObjectException;
 
 import com.sun.s1asdev.ejb.ee.ejb.BMTSessionHome;
 import com.sun.s1asdev.ejb.ee.ejb.BMTSession;

appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/client/Client.java
index a8716af..2c85d8b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/client/Client.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -16,14 +16,10 @@
 
 package com.sun.s1asdev.ejb.ee.client;
 
-import java.util.ArrayList;
-
-import java.io.Serializable;
 import javax.naming.*;
-import javax.jms.*;
+import jakarta.jms.*;
 import javax.ejb.*;
 import javax.rmi.PortableRemoteObject;
-import java.rmi.NoSuchObjectException;
 
 import com.sun.s1asdev.ejb.ee.ejb.BMTSessionHome;
 import com.sun.s1asdev.ejb.ee.ejb.BMTSession;

appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/client/Client.java
index 3367b1b..7b60351 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/client/Client.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -16,14 +16,10 @@
 
 package com.sun.s1asdev.ejb.ee.txcheckpoint.simpletx.client;
 
-import java.util.ArrayList;
-
-import java.io.Serializable;
 import javax.naming.*;
-import javax.jms.*;
+import jakarta.jms.*;
 import javax.ejb.*;
 import javax.rmi.PortableRemoteObject;
-import java.rmi.NoSuchObjectException;
 
 import com.sun.s1asdev.ejb.ee.txcheckpoint.simpletx.ejb.SFSBHome;
 import com.sun.s1asdev.ejb.ee.txcheckpoint.simpletx.ejb.SFSB;

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/build.xml

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/build.xml
index 1ccf60b..bac2cf0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/build.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE project [
 <!--
 
-    Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -79,7 +79,7 @@
     <target name="run_standaloneclient" depends="init-common">
        <java  fork="on" 
               failonerror="true"
-              classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/javax.jms.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
+              classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/jakarta.jms-api.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
               classname="${simple.client}">
         </java>
     </target>

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/client/Client.java
index cadbb45..e984db3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/client/Client.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -19,7 +19,7 @@
 import java.io.*;
 import java.util.*;
 import javax.ejb.EJBHome;
-import javax.jms.*;
+import jakarta.jms.*;
 import javax.annotation.Resource;
 import javax.naming.InitialContext;
 
@@ -47,10 +47,10 @@
     private static QueueConnectionFactory queueConFactory;
 
     @Resource(name="MsgBeanQueue", mappedName="jms/ejb_ejb30_hello_mdb_InQueue")
-    private static javax.jms.Queue msgBeanQueue;
+    private static jakarta.jms.Queue msgBeanQueue;
 
     @Resource(name="ClientQueue", mappedName="foo")
-    private static javax.jms.Queue clientQueue;
+    private static jakarta.jms.Queue clientQueue;
 
     private QueueConnection queueCon;
     private QueueSession queueSession;
@@ -73,9 +73,9 @@
 
 		System.out.println("Java SE mode...");
 		InitialContext ic = new InitialContext();
-		queueConFactory = (javax.jms.QueueConnectionFactory) ic.lookup("jms/ejb_ejb30_hello_mdb_QCF");
-		msgBeanQueue = (javax.jms.Queue) ic.lookup("jms/ejb_ejb30_hello_mdb_InQueue");
-		clientQueue = (javax.jms.Queue) ic.lookup("jms/ejb_ejb30_hello_mdb_OutQueue");
+		queueConFactory = (jakarta.jms.QueueConnectionFactory) ic.lookup("jms/ejb_ejb30_hello_mdb_QCF");
+		msgBeanQueue = (jakarta.jms.Queue) ic.lookup("jms/ejb_ejb30_hello_mdb_InQueue");
+		clientQueue = (jakarta.jms.Queue) ic.lookup("jms/ejb_ejb30_hello_mdb_OutQueue");
 		
 	    }
 
@@ -116,7 +116,7 @@
         }
     }
 
-    public void sendMsgs(javax.jms.Queue queue, Message msg, int num) 
+    public void sendMsgs(jakarta.jms.Queue queue, Message msg, int num) 
         throws JMSException {
         for(int i = 0; i < num; i++) {
             System.out.println("Sending message " + i + " to " + queue + 
@@ -136,7 +136,7 @@
 
         message.setBooleanProperty("flag", true);
         message.setIntProperty("num", 2);
-        sendMsgs((javax.jms.Queue) dest, message, num);
+        sendMsgs((jakarta.jms.Queue) dest, message, num);
 
         System.out.println("Waiting for queue message");
         Message recvdmessage = queueReceiver.receive(TIMEOUT);

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/create_resources.asadmin

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/create_resources.asadmin b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/create_resources.asadmin
index 95b9e9b..26deb7e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/create_resources.asadmin
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/create_resources.asadmin
@@ -1,5 +1,5 @@
-create-jms-resource --restype javax.jms.QueueConnectionFactory jms/ejb_ejb30_hello_mdb_QCF
+create-jms-resource --restype jakarta.jms.QueueConnectionFactory jms/ejb_ejb30_hello_mdb_QCF
 create-jmsdest --desttype queue ejb_ejb30_hello_mdb_InQueue 
-create-jms-resource --restype javax.jms.Queue --property imqDestinationName=ejb_ejb30_hello_mdb_InQueue jms/ejb_ejb30_hello_mdb_InQueue
+create-jms-resource --restype jakarta.jms.Queue --property imqDestinationName=ejb_ejb30_hello_mdb_InQueue jms/ejb_ejb30_hello_mdb_InQueue
 create-jmsdest --desttype queue ejb_ejb30_hello_mdb_OutQueue 
-create-jms-resource --restype javax.jms.Queue --property imqDestinationName=ejb_ejb30_hello_mdb_OutQueue jms/ejb_ejb30_hello_mdb_OutQueue
+create-jms-resource --restype jakarta.jms.Queue --property imqDestinationName=ejb_ejb30_hello_mdb_OutQueue jms/ejb_ejb30_hello_mdb_OutQueue

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/MessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/MessageBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/MessageBean.java
index fb58b6c..988a0c1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/MessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/MessageBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -24,15 +24,15 @@
 import javax.ejb.TransactionManagementType;
 import javax.ejb.ActivationConfigProperty;
 
-import javax.jms.MessageListener;
-import javax.jms.Message;
-import javax.jms.Queue;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.QueueConnection;
-import javax.jms.QueueSession;
-import javax.jms.QueueSender;
-import javax.jms.TextMessage;
-import javax.jms.Session;
+import jakarta.jms.MessageListener;
+import jakarta.jms.Message;
+import jakarta.jms.Queue;
+import jakarta.jms.QueueConnectionFactory;
+import jakarta.jms.QueueConnection;
+import jakarta.jms.QueueSession;
+import jakarta.jms.QueueSender;
+import jakarta.jms.TextMessage;
+import jakarta.jms.Session;
 
 import javax.annotation.Resource;
 

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/client/Client.java
index 2b1096f..30d312d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/client/Client.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -16,11 +16,8 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.mdb2.client;
 
-import java.io.*;
-import java.util.*;
-import javax.ejb.EJBHome;
 import javax.naming.*;
-import javax.jms.*;
+import jakarta.jms.*;
 import javax.annotation.Resource;
 
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
@@ -50,7 +47,7 @@
     private QueueSession queueSession;
     private QueueSender queueSender;
     private QueueReceiver queueReceiver;
-    private javax.jms.Queue clientQueue;
+    private jakarta.jms.Queue clientQueue;
 
 
     private int numMessages = 2;
@@ -85,7 +82,7 @@
         // Producer will be specified when actual msg is sent.
         queueSender = queueSession.createSender(null);        
 
-        clientQueue = (javax.jms.Queue)
+        clientQueue = (jakarta.jms.Queue)
 	    context.lookup("java:comp/env/jms/MsgBeanClientQueue");
 
         queueReceiver = queueSession.createReceiver(clientQueue);
@@ -104,7 +101,7 @@
         }
     }
 
-    public void sendMsgs(javax.jms.Queue queue, Message msg, int num) 
+    public void sendMsgs(jakarta.jms.Queue queue, Message msg, int num) 
         throws JMSException {
         for(int i = 0; i < num; i++) {
             System.out.println("Sending message " + i + " to " + queue + 
@@ -124,7 +121,7 @@
 
         message.setBooleanProperty("flag", true);
         message.setIntProperty("num", 2);
-        sendMsgs((javax.jms.Queue) dest, message, num);
+        sendMsgs((jakarta.jms.Queue) dest, message, num);
 
         System.out.println("Waiting for queue message");
         Message recvdmessage = queueReceiver.receive(TIMEOUT);

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/create_resources.asadmin

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/create_resources.asadmin b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/create_resources.asadmin
index e724192..017cfc3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/create_resources.asadmin
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/create_resources.asadmin
@@ -1,5 +1,5 @@
-create-jms-resource --restype javax.jms.QueueConnectionFactory jms/ejb_ejb30_hello_mdb2_QCF
+create-jms-resource --restype jakarta.jms.QueueConnectionFactory jms/ejb_ejb30_hello_mdb2_QCF
 create-jmsdest --desttype queue ejb_ejb30_hello_mdb2_InQueue 
-create-jms-resource --restype javax.jms.Queue --property imqDestinationName=ejb_ejb30_hello_mdb2_InQueue jms/ejb_ejb30_hello_mdb2_InQueue
+create-jms-resource --restype jakarta.jms.Queue --property imqDestinationName=ejb_ejb30_hello_mdb2_InQueue jms/ejb_ejb30_hello_mdb2_InQueue
 create-jmsdest --desttype queue ejb_ejb30_hello_mdb2_OutQueue 
-create-jms-resource --restype javax.jms.Queue --property imqDestinationName=ejb_ejb30_hello_mdb2_OutQueue jms/ejb_ejb30_hello_mdb2_OutQueue
+create-jms-resource --restype jakarta.jms.Queue --property imqDestinationName=ejb_ejb30_hello_mdb2_OutQueue jms/ejb_ejb30_hello_mdb2_OutQueue

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/descriptor/application-client.xml

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/descriptor/application-client.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/descriptor/application-client.xml
index d9e1f04..cc8c650 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/descriptor/application-client.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/descriptor/application-client.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -23,7 +23,7 @@
      <description>test destination</description>
      <message-destination-ref-name>jms/MsgBeanQueue
      </message-destination-ref-name>
-     <message-destination-type>javax.jms.Queue</message-destination-type>
+     <message-destination-type>jakarta.jms.Queue</message-destination-type>
      <message-destination-usage>Produces</message-destination-usage>
      <message-destination-link>MsgBeanInQueue</message-destination-link>
   </message-destination-ref>
@@ -31,7 +31,7 @@
      <description>test destination</description>
      <message-destination-ref-name>jms/MsgBeanClientQueue
      </message-destination-ref-name>
-     <message-destination-type>javax.jms.Queue</message-destination-type>
+     <message-destination-type>jakarta.jms.Queue</message-destination-type>
      <message-destination-usage>Consumes</message-destination-usage>
      <message-destination-link>MsgBeanOutQueue</message-destination-link>
   </message-destination-ref>

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/descriptor/ejb-jar.xml

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/descriptor/ejb-jar.xml
index 2e9816c..b14a8c7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/descriptor/ejb-jar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -23,9 +23,9 @@
     <message-driven>
       <display-name>MDB1</display-name>
       <ejb-name>MessageBean</ejb-name>
-      <messaging-type>javax.jms.MessageListener</messaging-type>
+      <messaging-type>jakarta.jms.MessageListener</messaging-type>
       <transaction-type>Container</transaction-type>
-      <message-destination-type>javax.jms.Queue</message-destination-type>
+      <message-destination-type>jakarta.jms.Queue</message-destination-type>
       <message-destination-link>MsgBeanInQueue</message-destination-link>
       <env-entry>
          <env-entry-name>com.sun.s1asdev.ejb.ejb30.hello.mdb2.MessageBean/stringValue1</env-entry-name>
@@ -59,7 +59,7 @@
         <description>test destination</description>
         <message-destination-ref-name>jms/ClientQueue
         </message-destination-ref-name>
-        <message-destination-type>javax.jms.Queue</message-destination-type>
+        <message-destination-type>jakarta.jms.Queue</message-destination-type>
         <message-destination-usage>Produces</message-destination-usage>
         <message-destination-link>MsgBeanOutQueue</message-destination-link>
       </message-destination-ref>

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/MessageBean.java

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 cbff219..c963a3d 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -31,15 +31,15 @@
 
 import javax.naming.InitialContext;
 
-import javax.jms.MessageListener;
-import javax.jms.Message;
-import javax.jms.Queue;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.QueueConnection;
-import javax.jms.QueueSession;
-import javax.jms.QueueSender;
-import javax.jms.TextMessage;
-import javax.jms.Session;
+import jakarta.jms.MessageListener;
+import jakarta.jms.Message;
+import jakarta.jms.Queue;
+import jakarta.jms.QueueConnectionFactory;
+import jakarta.jms.QueueConnection;
+import jakarta.jms.QueueSession;
+import jakarta.jms.QueueSender;
+import jakarta.jms.TextMessage;
+import jakarta.jms.Session;
 import javax.transaction.TransactionManager;
 import javax.transaction.Status;
 import javax.annotation.Resource;

appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/client/Client.java
index def4ef5..b87e715 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/client/Client.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,7 +20,7 @@
 import java.util.*;
 import javax.ejb.EJBHome;
 import javax.naming.*;
-import javax.jms.*;
+import jakarta.jms.*;
 
 
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
@@ -47,7 +47,7 @@
     private QueueSession queueSession;
     private QueueSender queueSender;
     private QueueReceiver queueReceiver;
-    private javax.jms.Queue clientQueue;
+    private jakarta.jms.Queue clientQueue;
 
 
     private int numMessages = 2;
@@ -89,7 +89,7 @@
         // Producer will be specified when actual msg is sent.
         queueSender = queueSession.createSender(null);        
 
-        clientQueue = (javax.jms.Queue)
+        clientQueue = (jakarta.jms.Queue)
             context.lookup("java:comp/env/jms/MsgBeanClientQueue");
 
         queueReceiver = queueSession.createReceiver(clientQueue);
@@ -108,7 +108,7 @@
         }
     }
 
-    public void sendMsgs(javax.jms.Queue queue, Message msg, int num) 
+    public void sendMsgs(jakarta.jms.Queue queue, Message msg, int num) 
         throws JMSException {
         for(int i = 0; i < num; i++) {
             System.out.println("Sending message " + i + " to " + queue + 
@@ -128,7 +128,7 @@
 
         message.setBooleanProperty("flag", true);
         message.setIntProperty("num", 2);
-        sendMsgs((javax.jms.Queue) dest, message, num);
+        sendMsgs((jakarta.jms.Queue) dest, message, num);
 
         System.out.println("Waiting for queue message");
         Message recvdmessage = queueReceiver.receive(TIMEOUT);

appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/create_resources.asadmin

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/create_resources.asadmin b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/create_resources.asadmin
index 0408a21..fe3bfd9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/create_resources.asadmin
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/create_resources.asadmin
@@ -1,11 +1,11 @@
-create-jms-resource --restype javax.jms.QueueConnectionFactory jms/ejb_ejb30_interceptors_mdb_QCF
+create-jms-resource --restype jakarta.jms.QueueConnectionFactory jms/ejb_ejb30_interceptors_mdb_QCF
 
 
 create-jmsdest --desttype queue ejb_ejb30_interceptors_mdb_InQueue 
-create-jms-resource --restype javax.jms.Queue --property imqDestinationName=ejb_ejb30_interceptors_mdb_InQueue jms/ejb_ejb30_interceptors_mdb_InQueue
+create-jms-resource --restype jakarta.jms.Queue --property imqDestinationName=ejb_ejb30_interceptors_mdb_InQueue jms/ejb_ejb30_interceptors_mdb_InQueue
 
 
 create-jmsdest --desttype queue ejb_ejb30_interceptors_mdb_OutQueue 
-create-jms-resource --restype javax.jms.Queue --property imqDestinationName=ejb_ejb30_interceptors_mdb_OutQueue jms/ejb_ejb30_interceptors_mdb_OutQueue
+create-jms-resource --restype jakarta.jms.Queue --property imqDestinationName=ejb_ejb30_interceptors_mdb_OutQueue jms/ejb_ejb30_interceptors_mdb_OutQueue
 
 quit

appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/descriptor/application-client.xml

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/descriptor/application-client.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/descriptor/application-client.xml
index a05e320..412fa13 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/descriptor/application-client.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/descriptor/application-client.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -21,7 +21,7 @@
   <display-name>ejb-ejb30-interceptors-mdbClient</display-name>
   <resource-ref>
     <res-ref-name>FooCF</res-ref-name>
-    <res-type>javax.jms.QueueConnectionFactory</res-type>
+    <res-type>jakarta.jms.QueueConnectionFactory</res-type>
     <res-auth>Container</res-auth>
     <res-sharing-scope>Shareable</res-sharing-scope>
   </resource-ref>
@@ -29,7 +29,7 @@
      <description>test destination</description>
      <message-destination-ref-name>jms/MsgBeanQueue
      </message-destination-ref-name>
-     <message-destination-type>javax.jms.Queue</message-destination-type>
+     <message-destination-type>jakarta.jms.Queue</message-destination-type>
      <message-destination-usage>Produces</message-destination-usage>
      <message-destination-link>MsgBeanInQueue</message-destination-link>
   </message-destination-ref>
@@ -37,7 +37,7 @@
      <description>test destination</description>
      <message-destination-ref-name>jms/MsgBeanClientQueue
      </message-destination-ref-name>
-     <message-destination-type>javax.jms.Queue</message-destination-type>
+     <message-destination-type>jakarta.jms.Queue</message-destination-type>
      <message-destination-usage>Consumes</message-destination-usage>
      <message-destination-link>MsgBeanOutQueue</message-destination-link>
   </message-destination-ref>

appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/descriptor/ejb-jar.xml

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/descriptor/ejb-jar.xml
index 23bc8c2..d3b4592 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/descriptor/ejb-jar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -24,14 +24,14 @@
       <display-name>MDB1</display-name>
       <ejb-name>MessageBean</ejb-name>
       <ejb-class>com.sun.s1asdev.ejb.ejb30.interceptors.mdb.MessageBean</ejb-class>
-      <messaging-type>javax.jms.MessageListener</messaging-type>
+      <messaging-type>jakarta.jms.MessageListener</messaging-type>
       <transaction-type>Bean</transaction-type>
-      <message-destination-type>javax.jms.Queue</message-destination-type>
+      <message-destination-type>jakarta.jms.Queue</message-destination-type>
       <message-destination-link>MsgBeanInQueue</message-destination-link>
       <resource-ref>
         <description>description</description>
         <res-ref-name>jms/MyQueueConnectionFactory</res-ref-name>
-        <res-type>javax.jms.QueueConnectionFactory</res-type>
+        <res-type>jakarta.jms.QueueConnectionFactory</res-type>
         <res-auth>Container</res-auth>
         <res-sharing-scope>Shareable</res-sharing-scope>
       </resource-ref>
@@ -39,7 +39,7 @@
         <description>test destination</description>
         <message-destination-ref-name>jms/ClientQueue
         </message-destination-ref-name>
-        <message-destination-type>javax.jms.Queue</message-destination-type>
+        <message-destination-type>jakarta.jms.Queue</message-destination-type>
         <message-destination-usage>Produces</message-destination-usage>
         <message-destination-link>MsgBeanOutQueue</message-destination-link>
       </message-destination-ref>

appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/MessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/MessageBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/MessageBean.java
index f45016d..748a6a0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/MessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/MessageBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -23,15 +23,15 @@
 
 import javax.naming.InitialContext;
 
-import javax.jms.MessageListener;
-import javax.jms.Message;
-import javax.jms.Queue;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.QueueConnection;
-import javax.jms.QueueSession;
-import javax.jms.QueueSender;
-import javax.jms.TextMessage;
-import javax.jms.Session;
+import jakarta.jms.MessageListener;
+import jakarta.jms.Message;
+import jakarta.jms.Queue;
+import jakarta.jms.QueueConnectionFactory;
+import jakarta.jms.QueueConnection;
+import jakarta.jms.QueueSession;
+import jakarta.jms.QueueSender;
+import jakarta.jms.TextMessage;
+import jakarta.jms.Session;
 import javax.interceptor.ExcludeClassInterceptors;
 import javax.interceptor.ExcludeDefaultInterceptors;
 import javax.interceptor.Interceptors;

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/mdb/build.xml

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/mdb/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/mdb/build.xml
index 81ff5a4..9d809ae 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/mdb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/mdb/build.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE project [
 <!--
 
-    Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -67,7 +67,7 @@
           <arg line="--user ${admin.user} --host ${admin.host} --port ${admin.port} --echo=true --terse=true"/>
           <arg line="create-jms-resource"/>
           <arg line="--restype"/>
-          <arg line="javax.jms.QueueConnectionFactory"/>
+          <arg line="jakarta.jms.QueueConnectionFactory"/>
           <arg line="jms/ejb_mdb_QCF"/>
         </exec>
 
@@ -83,7 +83,7 @@
           <arg line="--user ${admin.user} --host ${admin.host} --port ${admin.port} --echo=true --terse=true"/>
           <arg line="create-jms-resource"/>
           <arg line="--restype"/>
-          <arg line="javax.jms.Queue"/>
+          <arg line="jakarta.jms.Queue"/>
           <arg line="--property"/>
           <arg line="imqDestinationName=ejb_mdb_Queue"/>
           <arg line="jms/ejb_mdb_Queue"/>

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/mdb/ejb/SimpleEjb.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/mdb/ejb/SimpleEjb.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/mdb/ejb/SimpleEjb.java
index 78550e1..fd417cf 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/mdb/ejb/SimpleEjb.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/mdb/ejb/SimpleEjb.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -17,7 +17,7 @@
 package org.glassfish.tests.ejb.mdb;
 
 import javax.ejb.Singleton;
-import javax.jms.*;
+import jakarta.jms.*;
 import javax.annotation.Resource;
 
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/mdb/ejb/SimpleMDB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/mdb/ejb/SimpleMDB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/mdb/ejb/SimpleMDB.java
index f916b08..86bc71d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/mdb/ejb/SimpleMDB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/mdb/ejb/SimpleMDB.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -22,7 +22,7 @@
 package org.glassfish.tests.ejb.mdb;
 
 import javax.ejb.*;
-import javax.jms.*;
+import jakarta.jms.*;
 
 /**
  *

appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/create_resources.asadmin

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/create_resources.asadmin b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/create_resources.asadmin
index 0a3c444..d9b3eb9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/create_resources.asadmin
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/create_resources.asadmin
@@ -1,2 +1,2 @@
 create-jmsdest --desttype queue ejb_ejb31_timer31_mdb_InQueue 
-create-jms-resource --restype javax.jms.Queue --property imqDestinationName=ejb_ejb31_timer31_mdb_InQueue jms/ejb_ejb31_timer31_mdb_InQueue
+create-jms-resource --restype jakarta.jms.Queue --property imqDestinationName=ejb_ejb31_timer31_mdb_InQueue jms/ejb_ejb31_timer31_mdb_InQueue

appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/ejb/MessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/ejb/MessageBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/ejb/MessageBean.java
index 71e3bc1..22173a5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/ejb/MessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/ejb/MessageBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -26,8 +26,8 @@
 
 import javax.annotation.Resource;
 import javax.ejb.MessageDrivenContext;
-import javax.jms.MessageListener;
-import javax.jms.Message;
+import jakarta.jms.MessageListener;
+import jakarta.jms.Message;
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.annotation.security.*;

appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/client/Client.java
index 285d61d..8842704 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/client/Client.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -16,16 +16,8 @@
 
 package com.sun.s1asdev.timer31.nonpersistenttimer.client;
 
-import java.io.Serializable;
-import java.rmi.NoSuchObjectException;
-import java.util.Date;
-import java.util.Properties;
-import java.util.Set;
-
 import javax.ejb.*;
-//import javax.jms.*;
 import javax.naming.*;
-import javax.rmi.PortableRemoteObject;
 
 import com.sun.s1asdev.ejb31.timer.nonpersistenttimer.StatefulWrapper;
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/create_resources.asadmin

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/create_resources.asadmin b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/create_resources.asadmin
index f248737..8ed3b14 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/create_resources.asadmin
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/create_resources.asadmin
@@ -1,10 +1,10 @@
-create-jms-resource --restype javax.jms.QueueConnectionFactory  jms/ejb_timer_nonpersistenttimer_QCF
-create-jms-resource --restype javax.jms.TopicConnectionFactory  jms/ejb_timer_nonpersistenttimer_TCF
+create-jms-resource --restype jakarta.jms.QueueConnectionFactory  jms/ejb_timer_nonpersistenttimer_QCF
+create-jms-resource --restype jakarta.jms.TopicConnectionFactory  jms/ejb_timer_nonpersistenttimer_TCF
 
-create-jms-resource --restype javax.jms.Queue --enabled=true --property imqDestinationName=ejb_timer_nonpersistenttimer_queue jms/ejb_timer_nonpersistenttimer_queue
-create-jms-resource --restype javax.jms.Topic --enabled=true --property imqDestinationName=ejb_timer_nonpersistenttimer_topic jms/ejb_timer_nonpersistenttimer_topic
-create-jms-resource --restype javax.jms.Queue --enabled=true --property imqDestinationName=ejb_timer_nonpersistenttimer_mdb_cmt jms/ejb_timer_nonpersistenttimer_mdb_cmt
-create-jms-resource --restype javax.jms.Queue --enabled=true --property imqDestinationName=ejb_timer_nonpersistenttimer_mdb_bmt jms/ejb_timer_nonpersistenttimer_mdb_bmt
+create-jms-resource --restype jakarta.jms.Queue --enabled=true --property imqDestinationName=ejb_timer_nonpersistenttimer_queue jms/ejb_timer_nonpersistenttimer_queue
+create-jms-resource --restype jakarta.jms.Topic --enabled=true --property imqDestinationName=ejb_timer_nonpersistenttimer_topic jms/ejb_timer_nonpersistenttimer_topic
+create-jms-resource --restype jakarta.jms.Queue --enabled=true --property imqDestinationName=ejb_timer_nonpersistenttimer_mdb_cmt jms/ejb_timer_nonpersistenttimer_mdb_cmt
+create-jms-resource --restype jakarta.jms.Queue --enabled=true --property imqDestinationName=ejb_timer_nonpersistenttimer_mdb_bmt jms/ejb_timer_nonpersistenttimer_mdb_bmt
 
 create-jmsdest --desttype queue ejb_timer_nonpersistenttimer_queue
 create-jmsdest --desttype topic ejb_timer_nonpersistenttimer_topic

appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/descriptor/ejb-jar.xml

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/descriptor/ejb-jar.xml
index f5fbff3..114168e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/descriptor/ejb-jar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -24,9 +24,9 @@
     <message-driven>
       <ejb-name>msgbean_BMT</ejb-name>
       <ejb-class>com.sun.s1asdev.ejb31.timer.nonpersistenttimer.MessageDrivenEJB</ejb-class>
-      <messaging-type>javax.jms.MessageListener</messaging-type>
+      <messaging-type>jakarta.jms.MessageListener</messaging-type>
       <transaction-type>Bean</transaction-type>
-      <message-destination-type>javax.jms.Queue</message-destination-type>
+      <message-destination-type>jakarta.jms.Queue</message-destination-type>
       <message-destination-link>TimerMDBQueue_BMT</message-destination-link>
       <env-entry>
         <env-entry-name>txmode</env-entry-name>
@@ -36,14 +36,14 @@
       <resource-ref>
         <description>description</description>
         <res-ref-name>jms/MyQueueConnectionFactory</res-ref-name>
-        <res-type>javax.jms.QueueConnectionFactory</res-type>
+        <res-type>jakarta.jms.QueueConnectionFactory</res-type>
         <res-auth>Container</res-auth>
         <res-sharing-scope>Shareable</res-sharing-scope>
       </resource-ref>
       <message-destination-ref>       
         <description>timertest destination</description>
         <message-destination-ref-name>jms/MyQueue</message-destination-ref-name>
-        <message-destination-type>javax.jms.Queue</message-destination-type>
+        <message-destination-type>jakarta.jms.Queue</message-destination-type>
         <message-destination-usage>ConsumesProduces</message-destination-usage>
         <message-destination-link>TimerQueue</message-destination-link>
       </message-destination-ref>
@@ -51,9 +51,9 @@
     <message-driven>
       <ejb-name>msgbean_CMT</ejb-name>
       <ejb-class>com.sun.s1asdev.ejb31.timer.nonpersistenttimer.MessageDrivenEJB</ejb-class>
-      <messaging-type>javax.jms.MessageListener</messaging-type>
+      <messaging-type>jakarta.jms.MessageListener</messaging-type>
       <transaction-type>Container</transaction-type>
-      <message-destination-type>javax.jms.Queue</message-destination-type>
+      <message-destination-type>jakarta.jms.Queue</message-destination-type>
       <message-destination-link>TimerMDBQueue_CMT</message-destination-link>
       <env-entry>
         <env-entry-name>txmode</env-entry-name>
@@ -63,14 +63,14 @@
       <resource-ref>
         <description>description</description>
         <res-ref-name>jms/MyQueueConnectionFactory</res-ref-name>
-        <res-type>javax.jms.QueueConnectionFactory</res-type>
+        <res-type>jakarta.jms.QueueConnectionFactory</res-type>
         <res-auth>Container</res-auth>
         <res-sharing-scope>Shareable</res-sharing-scope>
       </resource-ref>
       <message-destination-ref>       
         <description>timertest destination</description>
         <message-destination-ref-name>jms/MyQueue</message-destination-ref-name>
-        <message-destination-type>javax.jms.Queue</message-destination-type>
+        <message-destination-type>jakarta.jms.Queue</message-destination-type>
         <message-destination-usage>ConsumesProduces</message-destination-usage>
         <message-destination-link>TimerQueue</message-destination-link>
       </message-destination-ref>
@@ -92,14 +92,14 @@
       <resource-ref>
         <description>description</description>
         <res-ref-name>jms/MyQueueConnectionFactory</res-ref-name>
-        <res-type>javax.jms.QueueConnectionFactory</res-type>
+        <res-type>jakarta.jms.QueueConnectionFactory</res-type>
         <res-auth>Container</res-auth>
         <res-sharing-scope>Shareable</res-sharing-scope>
       </resource-ref>
       <message-destination-ref>       
         <description>timertest destination</description>
         <message-destination-ref-name>jms/MyQueue</message-destination-ref-name>
-        <message-destination-type>javax.jms.Queue</message-destination-type>
+        <message-destination-type>jakarta.jms.Queue</message-destination-type>
         <message-destination-usage>ConsumesProduces</message-destination-usage>
         <message-destination-link>TimerQueue</message-destination-link>
       </message-destination-ref>
@@ -124,14 +124,14 @@
       <resource-ref>
         <description>description</description>
         <res-ref-name>jms/MyQueueConnectionFactory</res-ref-name>
-        <res-type>javax.jms.QueueConnectionFactory</res-type>
+        <res-type>jakarta.jms.QueueConnectionFactory</res-type>
         <res-auth>Container</res-auth>
         <res-sharing-scope>Shareable</res-sharing-scope>
       </resource-ref>
       <message-destination-ref>       
         <description>timertest destination</description>
         <message-destination-ref-name>jms/MyQueue</message-destination-ref-name>
-        <message-destination-type>javax.jms.Queue</message-destination-type>
+        <message-destination-type>jakarta.jms.Queue</message-destination-type>
         <message-destination-usage>ConsumesProduces</message-destination-usage>
         <message-destination-link>TimerQueue</message-destination-link>
       </message-destination-ref>
@@ -156,14 +156,14 @@
       <resource-ref>
         <description>description</description>
         <res-ref-name>jms/MyQueueConnectionFactory</res-ref-name>
-        <res-type>javax.jms.QueueConnectionFactory</res-type>
+        <res-type>jakarta.jms.QueueConnectionFactory</res-type>
         <res-auth>Container</res-auth>
         <res-sharing-scope>Shareable</res-sharing-scope>
       </resource-ref>
       <message-destination-ref>       
         <description>timertest destination</description>
         <message-destination-ref-name>jms/MyQueue</message-destination-ref-name>
-        <message-destination-type>javax.jms.Queue</message-destination-type>
+        <message-destination-type>jakarta.jms.Queue</message-destination-type>
         <message-destination-usage>ConsumesProduces</message-destination-usage>
         <message-destination-link>TimerQueue</message-destination-link>
       </message-destination-ref>
@@ -211,7 +211,7 @@
         <ejb-name>msgbean_CMT</ejb-name>
         <method-name>onMessage</method-name>
         <method-params>
-          <method-param>javax.jms.Message</method-param>
+          <method-param>jakarta.jms.Message</method-param>
         </method-params>
       </method>
       <trans-attribute>Required</trans-attribute>

appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/MessageDrivenEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/MessageDrivenEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/MessageDrivenEJB.java
index 7a1248d..7145510 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/MessageDrivenEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/MessageDrivenEJB.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -16,9 +16,8 @@
 
 package com.sun.s1asdev.ejb31.timer.nonpersistenttimer;
 
-import javax.jms.*;
+import jakarta.jms.*;
 import javax.ejb.*;
-import java.io.Serializable;
 
 public class MessageDrivenEJB extends TimerStuffImpl 
     implements MessageDrivenBean, TimedObject, MessageListener {

appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/StatefulWrapperImpl.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/StatefulWrapperImpl.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/StatefulWrapperImpl.java
index ec604d7..62fdeee 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/StatefulWrapperImpl.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/StatefulWrapperImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -16,14 +16,8 @@
 
 package com.sun.s1asdev.ejb31.timer.nonpersistenttimer;
 
-import java.io.Serializable;
-import java.rmi.NoSuchObjectException;
 import java.util.Date;
-import java.util.Properties;
-import java.util.Set;
-
 import javax.ejb.*;
-//import javax.jms.*;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/TimerStuffImpl.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/TimerStuffImpl.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/TimerStuffImpl.java
index 49970f5..25345e3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/TimerStuffImpl.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/TimerStuffImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -24,14 +24,13 @@
 import java.util.Collection;
 import java.util.Iterator;
 import javax.ejb.*;
-import javax.jms.JMSException;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.QueueConnection;
-import javax.jms.Queue;
-import javax.jms.QueueSession;
-import javax.jms.QueueSender;
-import javax.jms.QueueReceiver;
-import javax.jms.TextMessage;
+import jakarta.jms.QueueConnectionFactory;
+import jakarta.jms.QueueConnection;
+import jakarta.jms.Queue;
+import jakarta.jms.QueueSession;
+import jakarta.jms.QueueSender;
+import jakarta.jms.QueueReceiver;
+import jakarta.jms.TextMessage;
 
 public class TimerStuffImpl implements TimerStuff {
     

appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/reschedule_after_failures/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/reschedule_after_failures/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/reschedule_after_failures/client/Client.java
index 7fdd9a4..8cc0c2f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/reschedule_after_failures/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/reschedule_after_failures/client/Client.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -16,19 +16,9 @@
 
 package com.sun.s1asdev.timer31.reschedule_after_failures.client;
 
-import java.io.Serializable;
-import java.rmi.NoSuchObjectException;
-import java.util.Date;
-import java.util.Properties;
-import java.util.Set;
-
 import javax.ejb.*;
-//import javax.jms.*;
 import javax.naming.*;
-import javax.rmi.PortableRemoteObject;
-
 import com.sun.s1asdev.ejb31.timer.reschedule_after_failures.Stles;
-
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
 
 public class Client {

appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_ann/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_ann/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_ann/client/Client.java
index a30a861..dd653f9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_ann/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_ann/client/Client.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -16,19 +16,9 @@
 
 package com.sun.s1asdev.timer31.schedule_ann.client;
 
-import java.io.Serializable;
-import java.rmi.NoSuchObjectException;
-import java.util.Date;
-import java.util.Properties;
-import java.util.Set;
-
 import javax.ejb.*;
-//import javax.jms.*;
 import javax.naming.*;
-import javax.rmi.PortableRemoteObject;
-
 import com.sun.s1asdev.ejb31.timer.schedule_ann.Stles;
-
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
 
 public class Client {

appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/client/Client.java
index e1da741..9e24248 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/client/Client.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -16,16 +16,8 @@
 
 package com.sun.s1asdev.timer31.schedule_exp.client;
 
-import java.io.Serializable;
-import java.rmi.NoSuchObjectException;
-import java.util.Date;
-import java.util.Properties;
-import java.util.Set;
-
 import javax.ejb.*;
-//import javax.jms.*;
 import javax.naming.*;
-import javax.rmi.PortableRemoteObject;
 
 import com.sun.s1asdev.ejb31.timer.schedule_exp.Stles;
 

appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/client/Client.java
index 9803c57..589c4f3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/client/Client.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -16,15 +16,9 @@
 
 package com.sun.s1asdev.ejb.jms.jmsejb.client;
 
-import java.io.*;
-import java.util.*;
-import javax.ejb.EJBHome;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;
-import org.omg.CORBA.ORB;
-import java.sql.*;
-import javax.sql.*;
-import javax.jms.*;
+import jakarta.jms.*;
 import com.sun.s1asdev.ejb.jms.jmsejb.HelloHome;
 import com.sun.s1asdev.ejb.jms.jmsejb.Hello;
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;

appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/create_resources.asadmin

diff --git a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/create_resources.asadmin b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/create_resources.asadmin
index 703ac91..7a706aa 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/create_resources.asadmin
+++ b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/create_resources.asadmin
@@ -1,7 +1,7 @@
-create-jms-resource --restype javax.jms.QueueConnectionFactory jms/ejb_jms_jmsejb_QCF
+create-jms-resource --restype jakarta.jms.QueueConnectionFactory jms/ejb_jms_jmsejb_QCF
 
 create-jmsdest --desttype queue ejb_jms_jmsejb_Queue
-create-jms-resource --restype javax.jms.Queue --property imqDestinationName=ejb_jms_jmsejb_Queue jms/ejb_jms_jmsejb_Queue
+create-jms-resource --restype jakarta.jms.Queue --property imqDestinationName=ejb_jms_jmsejb_Queue jms/ejb_jms_jmsejb_Queue
 
 
 quit

appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/descriptor/ejb-jar.xml

diff --git a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/descriptor/ejb-jar.xml
index ae23eab..44cbebc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/descriptor/ejb-jar.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN" "http://java.sun.com/dtd/ejb-jar_2_0.dtd">
 <!--
 
-    Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -55,13 +55,13 @@
       <resource-ref>
         <description>description</description>
         <res-ref-name>jms/MyQueueConnectionFactory</res-ref-name>
-        <res-type>javax.jms.QueueConnectionFactory</res-type>
+        <res-type>jakarta.jms.QueueConnectionFactory</res-type>
         <res-auth>Bean</res-auth>
         <res-sharing-scope>Shareable</res-sharing-scope>
       </resource-ref>
       <resource-env-ref>
         <resource-env-ref-name>jms/QueueName</resource-env-ref-name>
-        <resource-env-ref-type>javax.jms.Queue</resource-env-ref-type>
+        <resource-env-ref-type>jakarta.jms.Queue</resource-env-ref-type>
       </resource-env-ref>
     </session>
     <session>
@@ -98,13 +98,13 @@
       <resource-ref>
         <description>description</description>
         <res-ref-name>jms/MyQueueConnectionFactory</res-ref-name>
-        <res-type>javax.jms.QueueConnectionFactory</res-type>
+        <res-type>jakarta.jms.QueueConnectionFactory</res-type>
         <res-auth>Bean</res-auth>
         <res-sharing-scope>Shareable</res-sharing-scope>
       </resource-ref>
       <resource-env-ref>
         <resource-env-ref-name>jms/QueueName</resource-env-ref-name>
-        <resource-env-ref-type>javax.jms.Queue</resource-env-ref-type>
+        <resource-env-ref-type>jakarta.jms.Queue</resource-env-ref-type>
       </resource-env-ref>
     </session>
   </enterprise-beans>

appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/ejb/HelloBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/ejb/HelloBean.java b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/ejb/HelloBean.java
index aae0335..f3ad6a9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/ejb/HelloBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/ejb/HelloBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -16,15 +16,12 @@
 
 package com.sun.s1asdev.ejb.jms.jmsejb;
 
-import java.util.Enumeration;
-import java.io.Serializable;
 import java.rmi.RemoteException; 
 import javax.ejb.SessionBean;
 import javax.ejb.SessionContext;
 import javax.ejb.EJBException;
 import javax.naming.*;
-import javax.jms.*;
-import javax.transaction.UserTransaction;
+import jakarta.jms.*;
 
 public class HelloBean implements SessionBean {
     private String str;
@@ -86,11 +83,11 @@
                 session.commit();
                 throw new java.lang.IllegalStateException
                     ("Didn't get session.commit exception");
-            } catch(javax.jms.TransactionInProgressException tipe) {
+            } catch(jakarta.jms.TransactionInProgressException tipe) {
                 System.out.println
                     ("Successfully got tx in progress excep " +
                      "after calling session.commit in a global tx");
-            } catch(javax.jms.JMSException jmse) {
+            } catch(jakarta.jms.JMSException jmse) {
                 System.out.println
                     ("Got JMSException - it's also ok - " +
                      "after calling session.commit in a global tx");
@@ -110,7 +107,7 @@
                 session.commit();
                 throw new JMSException
                     ("Didn't get session.commit exception");
-            } catch(javax.jms.JMSException jmse) {
+            } catch(jakarta.jms.JMSException jmse) {
                 System.out.println("Successfully got session.commit " +
                                    "exception in ejb");
             }
@@ -119,7 +116,7 @@
                 session.rollback();
                 throw new JMSException
                     ("Didn't get session.rollback exception");
-            } catch(javax.jms.JMSException jmse) {
+            } catch(jakarta.jms.JMSException jmse) {
                 System.out.println("Successfully got session.rollback " +
                                    "exception in ejb");
             }
@@ -148,11 +145,11 @@
                         session.createObjectMessage();
                         throw new JMSException
                             ("Didn't get expected illegal state exception");
-                    } catch(javax.jms.IllegalStateException j1) {
+                    } catch(jakarta.jms.IllegalStateException j1) {
                         System.out.println
                             ("Successfully got illegal state exception " +
                              "when calling session method after close");
-                    } catch(javax.jms.JMSException j2) {
+                    } catch(jakarta.jms.JMSException j2) {
                         throw new JMSException("Got wrong jmsexception");
                     }
                     
@@ -160,11 +157,11 @@
                         session.getMessageListener();
                         throw new JMSException
                             ("Didn't get expected illegal state exception");
-                    } catch(javax.jms.IllegalStateException j3) {
+                    } catch(jakarta.jms.IllegalStateException j3) {
                         System.out.println
                             ("Successfully got illegal state exception " +
                              "when calling session method after close");
-                    } catch(javax.jms.JMSException j4) {
+                    } catch(jakarta.jms.JMSException j4) {
                         throw new JMSException("Got wrong jmsexception");
                     }
                 }

appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/client/Client.java
index 91d3712..d298129 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/client/Client.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -16,15 +16,9 @@
 
 package com.sun.s1asdev.ejb.jms.jmsejb2.client;
 
-import java.io.*;
-import java.util.*;
-import javax.ejb.EJBHome;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;
-import org.omg.CORBA.ORB;
-import java.sql.*;
-import javax.sql.*;
-import javax.jms.*;
+import jakarta.jms.*;
 import com.sun.s1asdev.ejb.jms.jmsejb2.HelloHome;
 import com.sun.s1asdev.ejb.jms.jmsejb2.Hello;
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;

appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/create_resources.asadmin

diff --git a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/create_resources.asadmin b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/create_resources.asadmin
index 0f5080f..6417c84 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/create_resources.asadmin
+++ b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/create_resources.asadmin
@@ -1,7 +1,7 @@
-create-jms-resource --restype javax.jms.QueueConnectionFactory jms/ejb_jms_jmsejb2_QCF
+create-jms-resource --restype jakarta.jms.QueueConnectionFactory jms/ejb_jms_jmsejb2_QCF
 
 create-jmsdest --desttype queue ejb_jms_jmsejb2_Queue
-create-jms-resource --restype javax.jms.Queue --property imqDestinationName=ejb_jms_jmsejb2_Queue jms/ejb_jms_jmsejb2_Queue
+create-jms-resource --restype jakarta.jms.Queue --property imqDestinationName=ejb_jms_jmsejb2_Queue jms/ejb_jms_jmsejb2_Queue
 
 
 quit

appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/descriptor/ejb-jar.xml

diff --git a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/descriptor/ejb-jar.xml
index 5f608de..545ae5e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/descriptor/ejb-jar.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN" "http://java.sun.com/dtd/ejb-jar_2_0.dtd">
 <!--
 
-    Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -35,13 +35,13 @@
       <resource-ref>
         <description>description</description>
         <res-ref-name>jms/MyQueueConnectionFactory</res-ref-name>
-        <res-type>javax.jms.QueueConnectionFactory</res-type>
+        <res-type>jakarta.jms.QueueConnectionFactory</res-type>
         <res-auth>Container</res-auth>
         <res-sharing-scope>Shareable</res-sharing-scope>
       </resource-ref>
       <resource-env-ref>
         <resource-env-ref-name>jms/QueueName</resource-env-ref-name>
-        <resource-env-ref-type>javax.jms.Queue</resource-env-ref-type>
+        <resource-env-ref-type>jakarta.jms.Queue</resource-env-ref-type>
       </resource-env-ref>
     </session>
   </enterprise-beans>

appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/ejb/HelloBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/ejb/HelloBean.java b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/ejb/HelloBean.java
index 806ef65..d8522bd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/ejb/HelloBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/ejb/HelloBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -16,15 +16,12 @@
 
 package com.sun.s1asdev.ejb.jms.jmsejb2;
 
-import java.util.Enumeration;
-import java.io.Serializable;
 import java.rmi.RemoteException; 
 import javax.ejb.SessionBean;
 import javax.ejb.SessionContext;
 import javax.ejb.EJBException;
 import javax.naming.*;
-import javax.jms.*;
-import javax.transaction.UserTransaction;
+import jakarta.jms.*;
 
 public class HelloBean implements SessionBean {
     private String str;

appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/client/Client.java
index 5f9b798..5c42b13 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/client/Client.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,7 +20,7 @@
 import java.util.*;
 import javax.ejb.EJBHome;
 import javax.naming.*;
-import javax.jms.*;
+import jakarta.jms.*;
 
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
 
@@ -43,7 +43,7 @@
     private QueueSession queueSession;
     private QueueSender queueSender;
     private QueueReceiver queueReceiver;
-    private javax.jms.Queue clientQueue;
+    private jakarta.jms.Queue clientQueue;
 
     private TopicConnection topicCon;
     private TopicSession topicSession;
@@ -114,7 +114,7 @@
         }
     }
 
-    public void sendMsgs(javax.jms.Queue queue, Message msg, int num) 
+    public void sendMsgs(jakarta.jms.Queue queue, Message msg, int num) 
         throws JMSException {
         for(int i = 0; i < num; i++) {
             System.out.println("Sending message " + i + " to " + queue + 
@@ -143,7 +143,7 @@
         //        Message message = topicSession.createTextMessage(destName);
         message.setBooleanProperty("flag", true);
         message.setIntProperty("num", 2);
-        sendMsgs((javax.jms.Queue) dest, message, num);
+        sendMsgs((jakarta.jms.Queue) dest, message, num);
     }
 }
 

appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/create_resources.asadmin

diff --git a/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/create_resources.asadmin b/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/create_resources.asadmin
index 0f83e41..7e3e7e0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/create_resources.asadmin
+++ b/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/create_resources.asadmin
@@ -1,5 +1,5 @@
-create-jms-resource --restype javax.jms.QueueConnectionFactory jms/ejb_mdb_cmt_QCF
+create-jms-resource --restype jakarta.jms.QueueConnectionFactory jms/ejb_mdb_cmt_QCF
 create-jmsdest --desttype queue ejb_mdb_cmt_InQueue 
-create-jms-resource --restype javax.jms.Queue --property imqDestinationName=ejb_mdb_cmt_InQueue jms/ejb_mdb_cmt_InQueue
+create-jms-resource --restype jakarta.jms.Queue --property imqDestinationName=ejb_mdb_cmt_InQueue jms/ejb_mdb_cmt_InQueue
 create-jmsdest --desttype queue ejb_mdb_cmt_OutQueue 
-create-jms-resource --restype javax.jms.Queue --property imqDestinationName=ejb_mdb_cmt_OutQueue jms/ejb_mdb_cmt_OutQueue
+create-jms-resource --restype jakarta.jms.Queue --property imqDestinationName=ejb_mdb_cmt_OutQueue jms/ejb_mdb_cmt_OutQueue

appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/descriptor/application-client.xml

diff --git a/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/descriptor/application-client.xml b/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/descriptor/application-client.xml
index a564a30..f9c4405 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/descriptor/application-client.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/descriptor/application-client.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -21,7 +21,7 @@
   <display-name>ejb-mdb-cmtClient</display-name>
   <resource-ref>
     <res-ref-name>FooCF</res-ref-name>
-    <res-type>javax.jms.QueueConnectionFactory</res-type>
+    <res-type>jakarta.jms.QueueConnectionFactory</res-type>
     <res-auth>Container</res-auth>
     <res-sharing-scope>Shareable</res-sharing-scope>
   </resource-ref>
@@ -29,7 +29,7 @@
      <description>test destination</description>
      <message-destination-ref-name>jms/MsgBeanQueue
      </message-destination-ref-name>
-     <message-destination-type>javax.jms.Queue</message-destination-type>
+     <message-destination-type>jakarta.jms.Queue</message-destination-type>
      <message-destination-usage>Produces</message-destination-usage>
      <message-destination-link>MsgBeanInQueue</message-destination-link>
   </message-destination-ref>
@@ -37,7 +37,7 @@
      <description>test explicit reference to another .jar msg dest</description>
      <message-destination-ref-name>jms/testref
      </message-destination-ref-name>
-     <message-destination-type>javax.jms.Queue</message-destination-type>
+     <message-destination-type>jakarta.jms.Queue</message-destination-type>
      <message-destination-usage>Produces</message-destination-usage>
      <message-destination-link>ejb-mdb-cmt-ejb.jar#MsgBeanInQueue
      </message-destination-link>

appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/descriptor/ejb-jar.xml

diff --git a/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/descriptor/ejb-jar.xml
index 7da3842..13843d9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/descriptor/ejb-jar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -24,14 +24,14 @@
       <display-name>MDB1</display-name>
       <ejb-name>MDB1</ejb-name>
       <ejb-class>com.sun.s1asdev.ejb.mdb.cmt.MessageBean</ejb-class>
-      <messaging-type>javax.jms.MessageListener</messaging-type>
+      <messaging-type>jakarta.jms.MessageListener</messaging-type>
       <transaction-type>Container</transaction-type>
-      <message-destination-type>javax.jms.Queue</message-destination-type>
+      <message-destination-type>jakarta.jms.Queue</message-destination-type>
       <message-destination-link>MsgBeanInQueue</message-destination-link>
       <resource-ref>
         <description>description</description>
         <res-ref-name>jms/MyQueueConnectionFactory</res-ref-name>
-        <res-type>javax.jms.QueueConnectionFactory</res-type>
+        <res-type>jakarta.jms.QueueConnectionFactory</res-type>
         <res-auth>Container</res-auth>
         <res-sharing-scope>Shareable</res-sharing-scope>
       </resource-ref>
@@ -39,7 +39,7 @@
         <description>test destination</description>
         <message-destination-ref-name>jms/MyQueue
         </message-destination-ref-name>
-        <message-destination-type>javax.jms.Queue</message-destination-type>
+        <message-destination-type>jakarta.jms.Queue</message-destination-type>
         <message-destination-usage>Consumes</message-destination-usage>
         <message-destination-link>MsgBeanOutQueue</message-destination-link>
       </message-destination-ref>
@@ -54,7 +54,7 @@
         <ejb-name>MDB1</ejb-name>
         <method-name>onMessage</method-name>
         <method-params>
-          <method-param>javax.jms.Message</method-param>
+          <method-param>jakarta.jms.Message</method-param>
         </method-params>
       </method>
       <trans-attribute>Required</trans-attribute>

appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/ejb/MessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/ejb/MessageBean.java b/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/ejb/MessageBean.java
index e5ef330..7f3c36f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/ejb/MessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/ejb/MessageBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -17,9 +17,8 @@
 package com.sun.s1asdev.ejb.mdb.cmt;
 
 import java.rmi.RemoteException;
-import javax.jms.*;
+import jakarta.jms.*;
 import javax.ejb.*;
-import java.io.Serializable;
 import javax.naming.*;
 
 public class MessageBean  

appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/client/HelloClient.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/client/HelloClient.java b/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/client/HelloClient.java
index ea3fd5c..1052069 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/client/HelloClient.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/client/HelloClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -16,15 +16,8 @@
 
 package com.sun.s1asdev.ejb.mdb.msgbean.client;
 
-import java.io.*;
-import java.util.*;
-import javax.ejb.EJBHome;
 import javax.naming.*;
-import javax.rmi.PortableRemoteObject;
-import org.omg.CORBA.ORB;
-import java.sql.*;
-import javax.sql.*;
-import javax.jms.*;
+import jakarta.jms.*;
 
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
 
@@ -51,7 +44,7 @@
     private QueueSession queueSession;
     private QueueSender queueSender;
     private QueueReceiver queueReceiver;
-    private javax.jms.Queue clientQueue;
+    private jakarta.jms.Queue clientQueue;
 
 
     private TopicConnection topicCon;
@@ -213,7 +206,7 @@
         // Producer will be specified when actual msg is sent.
         queueSender = queueSession.createSender(null);        
 
-        clientQueue = (javax.jms.Queue) 
+        clientQueue = (jakarta.jms.Queue) 
             context.lookup("java:comp/env/jms/client_queue");
 
         queueReceiver = queueSession.createReceiver(clientQueue);
@@ -256,7 +249,7 @@
         }
     }
 
-    public void sendMsgs(javax.jms.Queue queue, Message msg, int num) 
+    public void sendMsgs(jakarta.jms.Queue queue, Message msg, int num) 
         throws JMSException {
         for(int i = 0; i < num; i++) {
             System.out.println("Sending message " + i + " to " + queue);
@@ -333,7 +326,7 @@
         try {
             Destination dest = (Destination) context.lookup(destName);
             
-            boolean pointToPoint = dest instanceof javax.jms.Queue;
+            boolean pointToPoint = dest instanceof jakarta.jms.Queue;
             
             System.out.println("Beginning test : " + testName);
             
@@ -353,7 +346,7 @@
                 if( expectReply ) {
                     message.setJMSReplyTo(clientQueue);
                 }
-                sendMsgs((javax.jms.Queue) dest, message, numIter);
+                sendMsgs((jakarta.jms.Queue) dest, message, numIter);
             } else {
                 Message message = 
                     topicSession.createTextMessage(destName);

appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/create_resources.asadmin

diff --git a/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/create_resources.asadmin b/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/create_resources.asadmin
index c4e4e8c..63033f2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/create_resources.asadmin
+++ b/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/create_resources.asadmin
@@ -1,20 +1,20 @@
-create-jms-resource --restype javax.jms.QueueConnectionFactory jms/ejb_mdb_msgbean_QCF
-create-jms-resource --restype javax.jms.TopicConnectionFactory jms/ejb_mdb_msgbean_TCF
+create-jms-resource --restype jakarta.jms.QueueConnectionFactory jms/ejb_mdb_msgbean_QCF
+create-jms-resource --restype jakarta.jms.TopicConnectionFactory jms/ejb_mdb_msgbean_TCF
 create-jmsdest --desttype queue ejb_mdb_msgbean_client_queue
-create-jms-resource --restype javax.jms.Queue --property imqDestinationName=ejb_mdb_msgbean_client_queue jms/ejb_mdb_msgbean_client_queue
+create-jms-resource --restype jakarta.jms.Queue --property imqDestinationName=ejb_mdb_msgbean_client_queue jms/ejb_mdb_msgbean_client_queue
 create-jmsdest --desttype topic ejb_mdb_msgbean_client_topic
-create-jms-resource --restype javax.jms.Topic --property imqDestinationName=ejb_mdb_msgbean_client_topic jms/ejb_mdb_msgbean_client_topic
+create-jms-resource --restype jakarta.jms.Topic --property imqDestinationName=ejb_mdb_msgbean_client_topic jms/ejb_mdb_msgbean_client_topic
 create-jmsdest --desttype queue ejb_mdb_msgbean_queue_cmt
-create-jms-resource --restype javax.jms.Queue --property imqDestinationName=ejb_mdb_msgbean_queue_cmt jms/ejb_mdb_msgbean_queue_cmt
+create-jms-resource --restype jakarta.jms.Queue --property imqDestinationName=ejb_mdb_msgbean_queue_cmt jms/ejb_mdb_msgbean_queue_cmt
 create-jmsdest --desttype queue ejb_mdb_msgbean_queue_bmt
-create-jms-resource --restype javax.jms.Queue --property imqDestinationName=ejb_mdb_msgbean_queue_bmt jms/ejb_mdb_msgbean_queue_bmt
+create-jms-resource --restype jakarta.jms.Queue --property imqDestinationName=ejb_mdb_msgbean_queue_bmt jms/ejb_mdb_msgbean_queue_bmt
 create-jmsdest --desttype queue ejb_mdb_msgbean_queue_cmtns
-create-jms-resource --restype javax.jms.Queue --property imqDestinationName=ejb_mdb_msgbean_queue_cmtns jms/ejb_mdb_msgbean_queue_cmtns
+create-jms-resource --restype jakarta.jms.Queue --property imqDestinationName=ejb_mdb_msgbean_queue_cmtns jms/ejb_mdb_msgbean_queue_cmtns
 create-jmsdest --desttype topic ejb_mdb_msgbean_topic_cmt
-create-jms-resource --restype javax.jms.Topic --property imqDestinationName=ejb_mdb_msgbean_topic_cmt jms/ejb_mdb_msgbean_topic_cmt
+create-jms-resource --restype jakarta.jms.Topic --property imqDestinationName=ejb_mdb_msgbean_topic_cmt jms/ejb_mdb_msgbean_topic_cmt
 create-jmsdest --desttype topic ejb_mdb_msgbean_topic_bmt
-create-jms-resource --restype javax.jms.Topic --property imqDestinationName=ejb_mdb_msgbean_topic_bmt jms/ejb_mdb_msgbean_topic_bmt
+create-jms-resource --restype jakarta.jms.Topic --property imqDestinationName=ejb_mdb_msgbean_topic_bmt jms/ejb_mdb_msgbean_topic_bmt
 create-jmsdest --desttype topic ejb_mdb_msgbean_op_test_topic
-create-jms-resource --restype javax.jms.Topic --property imqDestinationName=ejb_mdb_msgbean_op_test_topic jms/ejb_mdb_msgbean_op_test_topic
+create-jms-resource --restype jakarta.jms.Topic --property imqDestinationName=ejb_mdb_msgbean_op_test_topic jms/ejb_mdb_msgbean_op_test_topic
 create-jmsdest --desttype queue ejb_mdb_msgbean_op_test_queue
-create-jms-resource --restype javax.jms.Queue --property imqDestinationName=ejb_mdb_msgbean_op_test_queue jms/ejb_mdb_msgbean_op_test_queue
+create-jms-resource --restype jakarta.jms.Queue --property imqDestinationName=ejb_mdb_msgbean_op_test_queue jms/ejb_mdb_msgbean_op_test_queue

appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/descriptor/application-client.xml

diff --git a/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/descriptor/application-client.xml b/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/descriptor/application-client.xml
index f958aa5..7151f29 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/descriptor/application-client.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/descriptor/application-client.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -21,13 +21,13 @@
   <display-name>ejb-mdb-msgbeanClient</display-name>
   <resource-ref>
     <res-ref-name>jms/QCF</res-ref-name>
-    <res-type>javax.jms.QueueConnectionFactory</res-type>
+    <res-type>jakarta.jms.QueueConnectionFactory</res-type>
     <res-auth>Container</res-auth>
     <res-sharing-scope>Shareable</res-sharing-scope>
   </resource-ref>
   <resource-ref>
     <res-ref-name>jms/TCF</res-ref-name>
-    <res-type>javax.jms.TopicConnectionFactory</res-type>
+    <res-type>jakarta.jms.TopicConnectionFactory</res-type>
     <res-auth>Container</res-auth>
     <res-sharing-scope>Shareable</res-sharing-scope>
   </resource-ref>
@@ -35,7 +35,7 @@
      <description>test destination</description>
      <message-destination-ref-name>jms/client_queue
      </message-destination-ref-name>
-     <message-destination-type>javax.jms.Queue</message-destination-type>
+     <message-destination-type>jakarta.jms.Queue</message-destination-type>
      <message-destination-usage>Produces</message-destination-usage>
      <message-destination-link>client_queue</message-destination-link>
   </message-destination-ref>
@@ -43,7 +43,7 @@
      <description>test destination</description>
      <message-destination-ref-name>jms/client_topic
      </message-destination-ref-name>
-     <message-destination-type>javax.jms.Topic</message-destination-type>
+     <message-destination-type>jakarta.jms.Topic</message-destination-type>
      <message-destination-usage>Produces</message-destination-usage>
      <message-destination-link>client_topic</message-destination-link>
   </message-destination-ref>
@@ -51,7 +51,7 @@
      <description>test destination</description>
      <message-destination-ref-name>jms/queue_cmt
      </message-destination-ref-name>
-     <message-destination-type>javax.jms.Queue</message-destination-type>
+     <message-destination-type>jakarta.jms.Queue</message-destination-type>
      <message-destination-usage>Produces</message-destination-usage>
      <message-destination-link>queue_cmt</message-destination-link>
   </message-destination-ref>
@@ -59,7 +59,7 @@
      <description>test destination</description>
      <message-destination-ref-name>jms/queue_bmt
      </message-destination-ref-name>
-     <message-destination-type>javax.jms.Queue</message-destination-type>
+     <message-destination-type>jakarta.jms.Queue</message-destination-type>
      <message-destination-usage>Produces</message-destination-usage>
      <message-destination-link>queue_bmt</message-destination-link>
   </message-destination-ref>
@@ -67,7 +67,7 @@
      <description>test destination</description>
      <message-destination-ref-name>jms/queue_cmtns
      </message-destination-ref-name>
-     <message-destination-type>javax.jms.Queue</message-destination-type>
+     <message-destination-type>jakarta.jms.Queue</message-destination-type>
      <message-destination-usage>Produces</message-destination-usage>
      <message-destination-link>queue_cmtns</message-destination-link>
   </message-destination-ref>
@@ -75,7 +75,7 @@
      <description>test destination</description>
      <message-destination-ref-name>jms/topic_cmt
      </message-destination-ref-name>
-     <message-destination-type>javax.jms.Topic</message-destination-type>
+     <message-destination-type>jakarta.jms.Topic</message-destination-type>
      <message-destination-usage>Produces</message-destination-usage>
      <message-destination-link>topic_cmt</message-destination-link>
   </message-destination-ref>
@@ -83,7 +83,7 @@
      <description>test destination</description>
      <message-destination-ref-name>jms/topic_bmt
      </message-destination-ref-name>
-     <message-destination-type>javax.jms.Topic</message-destination-type>
+     <message-destination-type>jakarta.jms.Topic</message-destination-type>
      <message-destination-usage>Produces</message-destination-usage>
      <message-destination-link>topic_cmt</message-destination-link>
   </message-destination-ref>

appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/descriptor/ejb-jar.xml

diff --git a/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/descriptor/ejb-jar.xml
index 63afe07..86df82d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/descriptor/ejb-jar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -24,9 +24,9 @@
       <display-name>MDB_QUEUE_BMT</display-name>
       <ejb-name>MDB_QUEUE_BMT</ejb-name>
       <ejb-class>com.sun.s1asdev.ejb.mdb.msgbean.MsgBean</ejb-class>
-      <messaging-type>javax.jms.MessageListener</messaging-type>
+      <messaging-type>jakarta.jms.MessageListener</messaging-type>
       <transaction-type>Bean</transaction-type>
-      <message-destination-type>javax.jms.Queue</message-destination-type>
+      <message-destination-type>jakarta.jms.Queue</message-destination-type>
       <env-entry>
         <env-entry-name>beanManagedTx</env-entry-name>
         <env-entry-type>java.lang.Boolean</env-entry-type>
@@ -35,14 +35,14 @@
       <resource-ref>
         <description>description</description>
         <res-ref-name>jms/MyQueueConnectionFactory</res-ref-name>
-        <res-type>javax.jms.QueueConnectionFactory</res-type>
+        <res-type>jakarta.jms.QueueConnectionFactory</res-type>
         <res-auth>Container</res-auth>
         <res-sharing-scope>Shareable</res-sharing-scope>
       </resource-ref>
       <resource-ref>
         <description>description</description>
         <res-ref-name>jms/MyTopicConnectionFactory</res-ref-name>
-        <res-type>javax.jms.TopicConnectionFactory</res-type>
+        <res-type>jakarta.jms.TopicConnectionFactory</res-type>
         <res-auth>Container</res-auth>
         <res-sharing-scope>Shareable</res-sharing-scope>
       </resource-ref>
@@ -61,9 +61,9 @@
       <display-name>MDB_QUEUE_CMT</display-name>
       <ejb-name>MDB_QUEUE_CMT</ejb-name>
       <ejb-class>com.sun.s1asdev.ejb.mdb.msgbean.MsgBean</ejb-class>
-      <messaging-type>javax.jms.MessageListener</messaging-type>
+      <messaging-type>jakarta.jms.MessageListener</messaging-type>
       <transaction-type>Container</transaction-type>
-      <message-destination-type>javax.jms.Queue</message-destination-type>
+      <message-destination-type>jakarta.jms.Queue</message-destination-type>
       <env-entry>
         <env-entry-name>beanManagedTx</env-entry-name>
         <env-entry-type>java.lang.Boolean</env-entry-type>
@@ -72,14 +72,14 @@
       <resource-ref>
         <description>description</description>
         <res-ref-name>jms/MyQueueConnectionFactory</res-ref-name>
-        <res-type>javax.jms.QueueConnectionFactory</res-type>
+        <res-type>jakarta.jms.QueueConnectionFactory</res-type>
         <res-auth>Container</res-auth>
         <res-sharing-scope>Shareable</res-sharing-scope>
       </resource-ref>
       <resource-ref>
         <description>description</description>
         <res-ref-name>jms/MyTopicConnectionFactory</res-ref-name>
-        <res-type>javax.jms.TopicConnectionFactory</res-type>
+        <res-type>jakarta.jms.TopicConnectionFactory</res-type>
         <res-auth>Container</res-auth>
         <res-sharing-scope>Shareable</res-sharing-scope>
       </resource-ref>
@@ -95,9 +95,9 @@
       <display-name>operationtestqueue</display-name>
       <ejb-name>operationtestqueue</ejb-name>
       <ejb-class>com.sun.s1asdev.ejb.mdb.msgbean.OperationTestMsgBean</ejb-class>
-      <messaging-type>javax.jms.MessageListener</messaging-type>
+      <messaging-type>jakarta.jms.MessageListener</messaging-type>
       <transaction-type>Bean</transaction-type>
-      <message-destination-type>javax.jms.Queue</message-destination-type>
+      <message-destination-type>jakarta.jms.Queue</message-destination-type>
       <env-entry>
         <env-entry-name>beanManagedTx</env-entry-name>
         <env-entry-type>java.lang.Boolean</env-entry-type>
@@ -113,9 +113,9 @@
       <display-name>operationtesttopic</display-name>
       <ejb-name>operationtesttopic</ejb-name>
       <ejb-class>com.sun.s1asdev.ejb.mdb.msgbean.OperationTestMsgBean</ejb-class>
-      <messaging-type>javax.jms.MessageListener</messaging-type>
+      <messaging-type>jakarta.jms.MessageListener</messaging-type>
       <transaction-type>Bean</transaction-type>
-      <message-destination-type>javax.jms.Topic</message-destination-type>
+      <message-destination-type>jakarta.jms.Topic</message-destination-type>
       <env-entry>
         <env-entry-name>beanManagedTx</env-entry-name>
         <env-entry-type>java.lang.Boolean</env-entry-type>
@@ -131,9 +131,9 @@
       <display-name>MDB_TOPIC_CMT</display-name>
       <ejb-name>MDB_TOPIC_CMT</ejb-name>
       <ejb-class>com.sun.s1asdev.ejb.mdb.msgbean.MsgBean</ejb-class>
-      <messaging-type>javax.jms.MessageListener</messaging-type>
+      <messaging-type>jakarta.jms.MessageListener</messaging-type>
       <transaction-type>Container</transaction-type>
-      <message-destination-type>javax.jms.Topic</message-destination-type>
+      <message-destination-type>jakarta.jms.Topic</message-destination-type>
       <env-entry>
         <env-entry-name>beanManagedTx</env-entry-name>
         <env-entry-type>java.lang.Boolean</env-entry-type>
@@ -142,14 +142,14 @@
       <resource-ref>
         <description>description</description>
         <res-ref-name>jms/MyQueueConnectionFactory</res-ref-name>
-        <res-type>javax.jms.QueueConnectionFactory</res-type>
+        <res-type>jakarta.jms.QueueConnectionFactory</res-type>
         <res-auth>Container</res-auth>
         <res-sharing-scope>Shareable</res-sharing-scope>
       </resource-ref>
       <resource-ref>
         <description>description</description>
         <res-ref-name>jms/MyTopicConnectionFactory</res-ref-name>
-        <res-type>javax.jms.TopicConnectionFactory</res-type>
+        <res-type>jakarta.jms.TopicConnectionFactory</res-type>
         <res-auth>Container</res-auth>
         <res-sharing-scope>Shareable</res-sharing-scope>
       </resource-ref>
@@ -165,9 +165,9 @@
       <display-name>MDB_QUEUE_CMTNS</display-name>
       <ejb-name>MDB_QUEUE_CMTNS</ejb-name>
       <ejb-class>com.sun.s1asdev.ejb.mdb.msgbean.MsgBean</ejb-class>
-      <messaging-type>javax.jms.MessageListener</messaging-type>
+      <messaging-type>jakarta.jms.MessageListener</messaging-type>
       <transaction-type>Container</transaction-type>
-      <message-destination-type>javax.jms.Queue</message-destination-type>
+      <message-destination-type>jakarta.jms.Queue</message-destination-type>
       <env-entry>
         <env-entry-name>beanManagedTx</env-entry-name>
         <env-entry-type>java.lang.Boolean</env-entry-type>
@@ -176,14 +176,14 @@
       <resource-ref>
         <description>description</description>
         <res-ref-name>jms/MyQueueConnectionFactory</res-ref-name>
-        <res-type>javax.jms.QueueConnectionFactory</res-type>
+        <res-type>jakarta.jms.QueueConnectionFactory</res-type>
         <res-auth>Container</res-auth>
         <res-sharing-scope>Shareable</res-sharing-scope>
       </resource-ref>
       <resource-ref>
         <description>description</description>
         <res-ref-name>jms/MyTopicConnectionFactory</res-ref-name>
-        <res-type>javax.jms.TopicConnectionFactory</res-type>
+        <res-type>jakarta.jms.TopicConnectionFactory</res-type>
         <res-auth>Container</res-auth>
         <res-sharing-scope>Shareable</res-sharing-scope>
       </resource-ref>
@@ -199,9 +199,9 @@
       <display-name>MDB_TOPIC_BMT</display-name>
       <ejb-name>MDB_TOPIC_BMT</ejb-name>
       <ejb-class>com.sun.s1asdev.ejb.mdb.msgbean.MsgBean</ejb-class>
-      <messaging-type>javax.jms.MessageListener</messaging-type>
+      <messaging-type>jakarta.jms.MessageListener</messaging-type>
       <transaction-type>Bean</transaction-type>
-      <message-destination-type>javax.jms.Topic</message-destination-type>
+      <message-destination-type>jakarta.jms.Topic</message-destination-type>
       <env-entry>
         <env-entry-name>beanManagedTx</env-entry-name>
         <env-entry-type>java.lang.Boolean</env-entry-type>
@@ -210,14 +210,14 @@
       <resource-ref>
         <description>description</description>
         <res-ref-name>jms/MyQueueConnectionFactory</res-ref-name>
-        <res-type>javax.jms.QueueConnectionFactory</res-type>
+        <res-type>jakarta.jms.QueueConnectionFactory</res-type>
         <res-auth>Container</res-auth>
         <res-sharing-scope>Shareable</res-sharing-scope>
       </resource-ref>
       <resource-ref>
         <description>description</description>
         <res-ref-name>jms/MyTopicConnectionFactory</res-ref-name>
-        <res-type>javax.jms.TopicConnectionFactory</res-type>
+        <res-type>jakarta.jms.TopicConnectionFactory</res-type>
         <res-auth>Container</res-auth>
         <res-sharing-scope>Shareable</res-sharing-scope>
       </resource-ref>
@@ -236,7 +236,7 @@
         <ejb-name>MDB_QUEUE_CMT</ejb-name>
         <method-name>onMessage</method-name>
         <method-params>
-          <method-param>javax.jms.Message</method-param>
+          <method-param>jakarta.jms.Message</method-param>
         </method-params>
       </method>
       <trans-attribute>Required</trans-attribute>
@@ -246,7 +246,7 @@
         <ejb-name>MDB_TOPIC_CMT</ejb-name>
         <method-name>onMessage</method-name>
         <method-params>
-          <method-param>javax.jms.Message</method-param>
+          <method-param>jakarta.jms.Message</method-param>
         </method-params>
       </method>
       <trans-attribute>Required</trans-attribute>
@@ -256,7 +256,7 @@
         <ejb-name>MDB_QUEUE_CMTNS</ejb-name>
         <method-name>onMessage</method-name>
         <method-params>
-          <method-param>javax.jms.Message</method-param>
+          <method-param>jakarta.jms.Message</method-param>
         </method-params>
       </method>
       <trans-attribute>NotSupported</trans-attribute>

appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/ejb/MsgBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/ejb/MsgBean.java b/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/ejb/MsgBean.java
index c00b7d1..7daac5a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/ejb/MsgBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/ejb/MsgBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -17,13 +17,11 @@
 package com.sun.s1asdev.ejb.mdb.msgbean;
 
 import java.util.Vector;
-import java.io.Serializable;
-import java.rmi.RemoteException; 
 import javax.ejb.EJBException;
 import javax.ejb.MessageDrivenBean;
 import javax.ejb.MessageDrivenContext;
 import javax.naming.*;
-import javax.jms.*;
+import jakarta.jms.*;
 import java.sql.*;
 import javax.sql.*;
 

appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/ejb/OperationTestMsgBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/ejb/OperationTestMsgBean.java b/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/ejb/OperationTestMsgBean.java
index 32168f9..c790707 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/ejb/OperationTestMsgBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/ejb/OperationTestMsgBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -16,14 +16,10 @@
 
 package com.sun.s1asdev.ejb.mdb.msgbean;
 
-import java.io.Serializable;
-import java.rmi.RemoteException; 
-import javax.ejb.EJBException;
 import javax.ejb.MessageDrivenBean;
 import javax.ejb.MessageDrivenContext;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import javax.rmi.PortableRemoteObject;
+import jakarta.jms.Message;
+import jakarta.jms.MessageListener;
 import javax.naming.*;
 
 public class OperationTestMsgBean implements MessageDrivenBean, 

appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/client/Client.java
index ad13c10..26411b8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/client/Client.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -16,10 +16,9 @@
 
 package com.sun.s1asdev.ejb.mdb.singleton.client;
 
-import java.io.*;
 import java.util.*;
 import javax.naming.*;
-import javax.jms.*;
+import jakarta.jms.*;
 import javax.annotation.*;
 import javax.ejb.*;
 import com.sun.s1asdev.ejb.mdb.singleton.FooRemoteIF;
@@ -51,7 +50,7 @@
     private QueueSession queueSession;
     private QueueSender queueSender;
     private QueueReceiver queueReceiver;
-    private javax.jms.Queue clientQueue;
+    private jakarta.jms.Queue clientQueue;
 
     private int numMessages = 1;
     private int numOfCalls = 120;
@@ -120,7 +119,7 @@
         }
     }
 
-    public void sendMsgs(javax.jms.Queue queue, Message msg, int num) 
+    public void sendMsgs(jakarta.jms.Queue queue, Message msg, int num) 
         throws JMSException {
         for(int i = 0; i < num; i++) {
             //System.out.println("Sending message " + i + " to " + queue + 
@@ -139,7 +138,7 @@
             //        Message message = topicSession.createTextMessage(destName);
             message.setBooleanProperty("flag", true);
             message.setIntProperty("num", i);
-            sendMsgs((javax.jms.Queue) dest, message, num);
+            sendMsgs((jakarta.jms.Queue) dest, message, num);
         }
 
         List<String> messageBeanInstances = new ArrayList<String>();

appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/create_resources.asadmin

diff --git a/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/create_resources.asadmin b/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/create_resources.asadmin
index 04a6de7..7258604 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/create_resources.asadmin
+++ b/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/create_resources.asadmin
@@ -1,5 +1,5 @@
-create-jms-resource --restype javax.jms.QueueConnectionFactory jms/ejb_mdb_singleton_QCF
+create-jms-resource --restype jakarta.jms.QueueConnectionFactory jms/ejb_mdb_singleton_QCF
 create-jmsdest --desttype queue ejb_mdb_singleton_InQueue 
-create-jms-resource --restype javax.jms.Queue --property imqDestinationName=ejb_mdb_singleton_InQueue jms/ejb_mdb_singleton_InQueue
+create-jms-resource --restype jakarta.jms.Queue --property imqDestinationName=ejb_mdb_singleton_InQueue jms/ejb_mdb_singleton_InQueue
 create-jmsdest --desttype queue ejb_mdb_singleton_OutQueue 
-create-jms-resource --restype javax.jms.Queue --property imqDestinationName=ejb_mdb_singleton_OutQueue jms/ejb_mdb_singleton_OutQueue
+create-jms-resource --restype jakarta.jms.Queue --property imqDestinationName=ejb_mdb_singleton_OutQueue jms/ejb_mdb_singleton_OutQueue

appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/descriptor/application-client.xml

diff --git a/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/descriptor/application-client.xml b/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/descriptor/application-client.xml
index 739d7b2..088b5fa 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/descriptor/application-client.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/descriptor/application-client.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -23,7 +23,7 @@
   <display-name>ejb-mdb-singletonClient</display-name>
   <resource-ref>
     <res-ref-name>FooCF</res-ref-name>
-    <res-type>javax.jms.QueueConnectionFactory</res-type>
+    <res-type>jakarta.jms.QueueConnectionFactory</res-type>
     <res-auth>Container</res-auth>
     <res-sharing-scope>Shareable</res-sharing-scope>
   </resource-ref>
@@ -31,7 +31,7 @@
      <description>test destination</description>
      <message-destination-ref-name>jms/MsgBeanQueue
      </message-destination-ref-name>
-     <message-destination-type>javax.jms.Queue</message-destination-type>
+     <message-destination-type>jakarta.jms.Queue</message-destination-type>
      <message-destination-usage>Produces</message-destination-usage>
      <message-destination-link>MsgBeanInQueue</message-destination-link>
   </message-destination-ref>
@@ -39,7 +39,7 @@
      <description>test explicit reference to another .jar msg dest</description>
      <message-destination-ref-name>jms/testref
      </message-destination-ref-name>
-     <message-destination-type>javax.jms.Queue</message-destination-type>
+     <message-destination-type>jakarta.jms.Queue</message-destination-type>
      <message-destination-usage>Produces</message-destination-usage>
      <message-destination-link>ejb-mdb-singleton-ejb.jar#MsgBeanInQueue
      </message-destination-link>

appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/descriptor/ejb-jar.xml

diff --git a/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/descriptor/ejb-jar.xml
index 1e086c4..1735893 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/descriptor/ejb-jar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -23,9 +23,9 @@
     <message-driven>
       <ejb-name>MessageBean</ejb-name>
       <ejb-class>com.sun.s1asdev.ejb.mdb.singleton.MessageBean</ejb-class>
-      <messaging-type>javax.jms.MessageListener</messaging-type>
+      <messaging-type>jakarta.jms.MessageListener</messaging-type>
       <transaction-type>Container</transaction-type>
-      <message-destination-type>javax.jms.Queue</message-destination-type>
+      <message-destination-type>jakarta.jms.Queue</message-destination-type>
       <message-destination-link>MsgBeanInQueue</message-destination-link>
     </message-driven>
   </enterprise-beans>

appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/ejb/MessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/ejb/MessageBean.java b/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/ejb/MessageBean.java
index 2fd7d3a..3b40a7f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/ejb/MessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/ejb/MessageBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.mdb.singleton;
 
-import javax.jms.*;
+import jakarta.jms.*;
 import javax.ejb.*;
 
 public class MessageBean implements  MessageListener {

appserver/tests/appserv-tests/devtests/ejb/perf/timer1/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/client/Client.java
index 65d8ca7..4a613e4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/client/Client.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -16,8 +16,7 @@
 
 package com.sun.s1asdev.ejb.perf.timer1;
 
-import java.io.Serializable;
-import javax.jms.*;
+import jakarta.jms.*;
 import javax.ejb.*;
 import javax.annotation.Resource;
 

appserver/tests/appserv-tests/devtests/ejb/perf/timer1/create_resources.asadmin

diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/create_resources.asadmin b/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/create_resources.asadmin
index 0ab9d1d..57ef077 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/create_resources.asadmin
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/create_resources.asadmin
@@ -1,7 +1,7 @@
-create-jms-resource --restype javax.jms.QueueConnectionFactory jms/ejb_perf_timer1_TQCF
+create-jms-resource --restype jakarta.jms.QueueConnectionFactory jms/ejb_perf_timer1_TQCF
 
 create-jmsdest --desttype queue ejb_perf_timer1_TQueue
-create-jms-resource --restype javax.jms.Queue --property imqDestinationName=ejb_perf_timer1_TQueue jms/ejb_perf_timer1_TQueue
+create-jms-resource --restype jakarta.jms.Queue --property imqDestinationName=ejb_perf_timer1_TQueue jms/ejb_perf_timer1_TQueue
 
 
 quit

appserver/tests/appserv-tests/devtests/ejb/perf/timer1/ejb/TimerSessionEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/ejb/TimerSessionEJB.java b/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/ejb/TimerSessionEJB.java
index c46b95a..3e667b4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/ejb/TimerSessionEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/ejb/TimerSessionEJB.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -17,7 +17,7 @@
 package com.sun.s1asdev.ejb.perf.timer1;
 
 import javax.ejb.*;
-import javax.jms.*;
+import jakarta.jms.*;
 import javax.annotation.*;
 import java.util.Date;
 

appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/client/Client.java
index 246df06..3d823ae 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/client/Client.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -18,12 +18,10 @@
 
 import java.util.ArrayList;
 
-import java.io.Serializable;
 import javax.naming.*;
-import javax.jms.*;
+import jakarta.jms.*;
 import javax.ejb.*;
 import javax.rmi.PortableRemoteObject;
-import java.rmi.NoSuchObjectException;
 
 import com.sun.s1asdev.ejb.sfsb.cacheNPE.ejb.SFSBHome;
 import com.sun.s1asdev.ejb.sfsb.cacheNPE.ejb.SFSB;

appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/client/Client.java
index b7e5d46..9e9950e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/client/Client.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -18,12 +18,10 @@
 
 import java.util.ArrayList;
 
-import java.io.Serializable;
 import javax.naming.*;
-import javax.jms.*;
+import jakarta.jms.*;
 import javax.ejb.*;
 import javax.rmi.PortableRemoteObject;
-import java.rmi.NoSuchObjectException;
 
 import com.sun.s1asdev.ejb.sfsb.keepstate.ejb.SFSBHome;
 import com.sun.s1asdev.ejb.sfsb.keepstate.ejb.SFSB;

appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/client/Client.java
index 03e82b7..f978a62 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/client/Client.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -17,13 +17,10 @@
 package com.sun.s1asdev.ejb.ejb30.sfsb.lifecycle.client;
 
 import java.util.ArrayList;
-
-import java.io.Serializable;
 import javax.naming.*;
-import javax.jms.*;
+import jakarta.jms.*;
 import javax.ejb.*;
 import javax.rmi.PortableRemoteObject;
-import java.rmi.NoSuchObjectException;
 
 import com.sun.s1asdev.ejb.ejb30.sfsb.lifecycle.ejb.SFSBHome;
 import com.sun.s1asdev.ejb.ejb30.sfsb.lifecycle.ejb.SFSB;

appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/client/Client.java

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 1a7b191..fec8470 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -17,13 +17,10 @@
 package com.sun.s1asdev.ejb.sfsb.passivateactivate.client;
 
 import java.util.ArrayList;
-
-import java.io.Serializable;
 import javax.naming.*;
-import javax.jms.*;
+import jakarta.jms.*;
 import javax.ejb.*;
 import javax.rmi.PortableRemoteObject;
-import java.rmi.NoSuchObjectException;
 
 import com.sun.s1asdev.ejb.sfsb.passivateactivate.ejb.SFSBHome;
 import com.sun.s1asdev.ejb.sfsb.passivateactivate.ejb.SFSB;

appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/client/Client.java
index b0f89ea..25d2cef 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/client/Client.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -18,12 +18,10 @@
 
 import java.util.ArrayList;
 
-import java.io.Serializable;
 import javax.naming.*;
-import javax.jms.*;
+import jakarta.jms.*;
 import javax.ejb.*;
 import javax.rmi.PortableRemoteObject;
-import java.rmi.NoSuchObjectException;
 
 import com.sun.s1asdev.ejb.ejb30.sfsb.lifecycle.ejb.SFSBHome;
 import com.sun.s1asdev.ejb.ejb30.sfsb.lifecycle.ejb.SFSB;

appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/client/Client.java
index dd89515..d56fcce 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/client/Client.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -18,12 +18,10 @@
 
 import java.util.ArrayList;
 
-import java.io.Serializable;
 import javax.naming.*;
-import javax.jms.*;
+import jakarta.jms.*;
 import javax.ejb.*;
 import javax.rmi.PortableRemoteObject;
-import java.rmi.NoSuchObjectException;
 
 import com.sun.s1asdev.ejb.sfsb.stress.ejb.StressSFSBHome;
 import com.sun.s1asdev.ejb.sfsb.stress.ejb.StressSFSB;

appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/client/Client.java
index f3205b9..d0827f1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/client/Client.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -18,12 +18,10 @@
 
 import java.util.ArrayList;
 
-import java.io.Serializable;
 import javax.naming.*;
-import javax.jms.*;
+import jakarta.jms.*;
 import javax.ejb.*;
 import javax.rmi.PortableRemoteObject;
-import java.rmi.NoSuchObjectException;
 
 import com.sun.s1asdev.ejb.stress.passivateactivate.ejb.SFSBHome;
 import com.sun.s1asdev.ejb.stress.passivateactivate.ejb.SFSB;

appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/client/Client.java
index 2dda69b..5211d07 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/client/Client.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -18,12 +18,10 @@
 
 import java.util.ArrayList;
 
-import java.io.Serializable;
 import javax.naming.*;
-import javax.jms.*;
+import jakarta.jms.*;
 import javax.ejb.*;
 import javax.rmi.PortableRemoteObject;
-import java.rmi.NoSuchObjectException;
 
 import com.sun.s1asdev.ejb.stress.sfsbcache.ejb.SFSBHome;
 import com.sun.s1asdev.ejb.stress.sfsbcache.ejb.SFSB;

appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/client/Client.java
index 928b6d6..6def4a3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/client/Client.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -16,11 +16,9 @@
 
 package com.sun.s1asdev.ejb.timer.mdbtimer.client;
 
-import java.io.*;
 import java.util.*;
-import javax.ejb.EJBHome;
 import javax.naming.*;
-import javax.jms.*;
+import jakarta.jms.*;
 
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
 
@@ -43,8 +41,8 @@
     private QueueSession queueSession;
     private QueueSender queueSender;
     private QueueReceiver queueReceiver;
-    private javax.jms.Queue clientDest;
-    private javax.jms.Queue targetDest;
+    private jakarta.jms.Queue clientDest;
+    private jakarta.jms.Queue targetDest;
 
     private int numMessages = 2;
     public Client(String[] args) {
@@ -79,12 +77,12 @@
         queueSession = queueCon.createQueueSession
             (false, Session.AUTO_ACKNOWLEDGE); 
 
-        targetDest = (javax.jms.Queue) context.lookup("java:comp/env/jms/MsgBeanQueue");
+        targetDest = (jakarta.jms.Queue) context.lookup("java:comp/env/jms/MsgBeanQueue");
 
         // Producer will be specified when actual msg is sent.
         queueSender = queueSession.createSender(targetDest);        
 
-        clientDest = (javax.jms.Queue) context.lookup("java:comp/env/jms/ClientQueue");
+        clientDest = (jakarta.jms.Queue) context.lookup("java:comp/env/jms/ClientQueue");
 
         queueReceiver = queueSession.createReceiver(clientDest);
 

appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/create_resources.asadmin

diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/create_resources.asadmin b/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/create_resources.asadmin
index 0065481..e36bf99 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/create_resources.asadmin
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/create_resources.asadmin
@@ -1,11 +1,11 @@
-create-jms-resource --restype javax.jms.QueueConnectionFactory jms/ejb_timer_mdbtimer_QCF
+create-jms-resource --restype jakarta.jms.QueueConnectionFactory jms/ejb_timer_mdbtimer_QCF
 
 
 create-jmsdest --desttype queue ejb_timer_mdbtimer_InQueue 
-create-jms-resource --restype javax.jms.Queue --property imqDestinationName=ejb_timer_mdbtimer_InQueue jms/ejb_timer_mdbtimer_InQueue
+create-jms-resource --restype jakarta.jms.Queue --property imqDestinationName=ejb_timer_mdbtimer_InQueue jms/ejb_timer_mdbtimer_InQueue
 
 
 create-jmsdest --desttype queue ejb_timer_mdbtimer_OutQueue 
-create-jms-resource --restype javax.jms.Queue --property imqDestinationName=ejb_timer_mdbtimer_OutQueue jms/ejb_timer_mdbtimer_OutQueue
+create-jms-resource --restype jakarta.jms.Queue --property imqDestinationName=ejb_timer_mdbtimer_OutQueue jms/ejb_timer_mdbtimer_OutQueue
 
 quit

appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/descriptor/application-client.xml

diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/descriptor/application-client.xml b/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/descriptor/application-client.xml
index a8d8b0c..2be1d29 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/descriptor/application-client.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/descriptor/application-client.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -21,7 +21,7 @@
   <display-name>ejb-timer-mdbtimerClient</display-name>
   <resource-ref>
     <res-ref-name>FooCF</res-ref-name>
-    <res-type>javax.jms.QueueConnectionFactory</res-type>
+    <res-type>jakarta.jms.QueueConnectionFactory</res-type>
     <res-auth>Container</res-auth>
     <res-sharing-scope>Shareable</res-sharing-scope>
   </resource-ref>
@@ -29,7 +29,7 @@
      <description>test destination</description>
      <message-destination-ref-name>jms/MsgBeanQueue
      </message-destination-ref-name>
-     <message-destination-type>javax.jms.Queue</message-destination-type>
+     <message-destination-type>jakarta.jms.Queue</message-destination-type>
      <message-destination-usage>Produces</message-destination-usage>
      <message-destination-link>MsgBeanInQueue</message-destination-link>
   </message-destination-ref>
@@ -37,7 +37,7 @@
      <description>test explicit reference to another .jar msg dest</description>
      <message-destination-ref-name>jms/testref
      </message-destination-ref-name>
-     <message-destination-type>javax.jms.Queue</message-destination-type>
+     <message-destination-type>jakarta.jms.Queue</message-destination-type>
      <message-destination-usage>Produces</message-destination-usage>
      <message-destination-link>ejb-timer-mdbtimer-ejb.jar#MsgBeanInQueue
      </message-destination-link>
@@ -46,7 +46,7 @@
      <description>test explicit reference to another .jar msg dest</description>
      <message-destination-ref-name>jms/ClientQueue
      </message-destination-ref-name>
-     <message-destination-type>javax.jms.Queue</message-destination-type>
+     <message-destination-type>jakarta.jms.Queue</message-destination-type>
      <message-destination-usage>Consumes</message-destination-usage>
      <message-destination-link>ejb-timer-mdbtimer-ejb.jar#MsgBeanOutQueue
      </message-destination-link>

appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/descriptor/ejb-jar.xml

diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/descriptor/ejb-jar.xml
index 89f7204..bfe50b5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/descriptor/ejb-jar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -24,14 +24,14 @@
       <display-name>MDB1</display-name>
       <ejb-name>MDB1</ejb-name>
       <ejb-class>com.sun.s1asdev.ejb.timer.mdbtimer.MessageBean</ejb-class>
-      <messaging-type>javax.jms.MessageListener</messaging-type>
+      <messaging-type>jakarta.jms.MessageListener</messaging-type>
       <transaction-type>Container</transaction-type>
-      <message-destination-type>javax.jms.Queue</message-destination-type>
+      <message-destination-type>jakarta.jms.Queue</message-destination-type>
       <message-destination-link>MsgBeanInQueue</message-destination-link>
       <resource-ref>
         <description>description</description>
         <res-ref-name>jms/MyQueueConnectionFactory</res-ref-name>
-        <res-type>javax.jms.QueueConnectionFactory</res-type>
+        <res-type>jakarta.jms.QueueConnectionFactory</res-type>
         <res-auth>Container</res-auth>
         <res-sharing-scope>Shareable</res-sharing-scope>
       </resource-ref>
@@ -39,7 +39,7 @@
         <description>test destination</description>
         <message-destination-ref-name>jms/MyQueue
         </message-destination-ref-name>
-        <message-destination-type>javax.jms.Queue</message-destination-type>
+        <message-destination-type>jakarta.jms.Queue</message-destination-type>
         <message-destination-usage>Produces</message-destination-usage>
         <message-destination-link>MsgBeanOutQueue</message-destination-link>
       </message-destination-ref>
@@ -51,7 +51,7 @@
         <ejb-name>MDB1</ejb-name>
         <method-name>onMessage</method-name>
         <method-params>
-          <method-param>javax.jms.Message</method-param>
+          <method-param>jakarta.jms.Message</method-param>
         </method-params>
       </method>
       <trans-attribute>Required</trans-attribute>

appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/ejb/MessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/ejb/MessageBean.java b/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/ejb/MessageBean.java
index 8fda6ca..40bdf3c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/ejb/MessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/ejb/MessageBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -17,9 +17,8 @@
 package com.sun.s1asdev.ejb.timer.mdbtimer;
 
 import java.rmi.RemoteException;
-import javax.jms.*;
+import jakarta.jms.*;
 import javax.ejb.*;
-import java.io.Serializable;
 import javax.naming.*;
 import java.util.Date;
 

appserver/tests/appserv-tests/devtests/ejb/timer/restore/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/restore/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/timer/restore/client/Client.java
index 8888f4b..a2eda9f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/restore/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/restore/client/Client.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -16,12 +16,10 @@
 
 package com.sun.s1asdev.ejb.timer.restore.client;
 
-import java.io.Serializable;
 import javax.naming.*;
-import javax.jms.*;
+import jakarta.jms.*;
 import javax.ejb.*;
 import javax.rmi.PortableRemoteObject;
-import java.rmi.NoSuchObjectException;
 import java.util.HashSet;
 import java.util.Set;
 import com.sun.s1asdev.ejb.timer.restore.TimerSession;

appserver/tests/appserv-tests/devtests/ejb/timer/restore/create_resources.asadmin

diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/restore/create_resources.asadmin b/appserver/tests/appserv-tests/devtests/ejb/timer/restore/create_resources.asadmin
index 730d4db..1e533f7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/restore/create_resources.asadmin
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/restore/create_resources.asadmin
@@ -1,7 +1,7 @@
-create-jms-resource --restype javax.jms.QueueConnectionFactory jms/ejb_timer_restore_TQCF
+create-jms-resource --restype jakarta.jms.QueueConnectionFactory jms/ejb_timer_restore_TQCF
 
 create-jmsdest --desttype queue ejb_timer_restore_TQueue
-create-jms-resource --restype javax.jms.Queue --property imqDestinationName=ejb_timer_restore_TQueue jms/ejb_timer_restore_TQueue
+create-jms-resource --restype jakarta.jms.Queue --property imqDestinationName=ejb_timer_restore_TQueue jms/ejb_timer_restore_TQueue
 
 
 quit

appserver/tests/appserv-tests/devtests/ejb/timer/restore/descriptor/application-client.xml

diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/restore/descriptor/application-client.xml b/appserver/tests/appserv-tests/devtests/ejb/timer/restore/descriptor/application-client.xml
index 67a7e4b..f6a7b3b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/restore/descriptor/application-client.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/restore/descriptor/application-client.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -29,12 +29,12 @@
   <resource-ref>
     <description>description</description>
     <res-ref-name>jms/MyQueueConnectionFactory</res-ref-name>
-    <res-type>javax.jms.QueueConnectionFactory</res-type>
+    <res-type>jakarta.jms.QueueConnectionFactory</res-type>
     <res-auth>Container</res-auth>
     <res-sharing-scope>Shareable</res-sharing-scope>
   </resource-ref>
   <resource-env-ref>
     <resource-env-ref-name>jms/MyQueue</resource-env-ref-name>
-    <resource-env-ref-type>javax.jms.Queue</resource-env-ref-type>
+    <resource-env-ref-type>jakarta.jms.Queue</resource-env-ref-type>
   </resource-env-ref>
 </application-client>

appserver/tests/appserv-tests/devtests/ejb/timer/restore/descriptor/ejb-jar.xml

diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/restore/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/timer/restore/descriptor/ejb-jar.xml
index fde6b7b..0d22a74 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/restore/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/restore/descriptor/ejb-jar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -30,13 +30,13 @@
       <resource-ref>
         <description>description</description>
         <res-ref-name>jms/MyQueueConnectionFactory</res-ref-name>
-        <res-type>javax.jms.QueueConnectionFactory</res-type>
+        <res-type>jakarta.jms.QueueConnectionFactory</res-type>
         <res-auth>Container</res-auth>
         <res-sharing-scope>Shareable</res-sharing-scope>
       </resource-ref>
       <resource-env-ref>
          <resource-env-ref-name>jms/MyQueue</resource-env-ref-name>
-         <resource-env-ref-type>javax.jms.Queue</resource-env-ref-type>
+         <resource-env-ref-type>jakarta.jms.Queue</resource-env-ref-type>
       </resource-env-ref>
       <security-identity>
         <use-caller-identity/>

appserver/tests/appserv-tests/devtests/ejb/timer/restore/ejb/TimerSessionEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/restore/ejb/TimerSessionEJB.java b/appserver/tests/appserv-tests/devtests/ejb/timer/restore/ejb/TimerSessionEJB.java
index 42b9900..032a037 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/restore/ejb/TimerSessionEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/restore/ejb/TimerSessionEJB.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -17,26 +17,23 @@
 package com.sun.s1asdev.ejb.timer.restore;
 
 import java.util.Iterator;
-import java.util.Collection;
 import java.util.Date;
-
 import javax.ejb.TimedObject;
 import javax.ejb.Timer;
 import javax.ejb.TimerHandle;
 import javax.ejb.TimerService;
 import javax.ejb.SessionBean;
 import javax.ejb.SessionContext;
-import javax.ejb.EJBContext;
 import javax.ejb.EJBException;
-import javax.jms.Session;
+import jakarta.jms.Session;
 import java.rmi.RemoteException;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.QueueConnection;
-import javax.jms.Queue;
-import javax.jms.QueueSender;
-import javax.jms.QueueSession;
-import javax.jms.JMSException;
-import javax.jms.TextMessage;
+import jakarta.jms.QueueConnectionFactory;
+import jakarta.jms.QueueConnection;
+import jakarta.jms.Queue;
+import jakarta.jms.QueueSender;
+import jakarta.jms.QueueSession;
+import jakarta.jms.JMSException;
+import jakarta.jms.TextMessage;
 import javax.naming.*;
 
 import com.sun.ejb.containers.TimerBean;

appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/client/Client.java
index 1a93c1c..4ccdd00 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/client/Client.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -16,13 +16,10 @@
 
 package com.sun.s1asdev.ejb.timer.sessiontimersecurity.client;
 
-import java.io.Serializable;
 import javax.naming.*;
-import javax.jms.*;
+import jakarta.jms.*;
 import javax.ejb.*;
 import javax.rmi.PortableRemoteObject;
-import java.rmi.NoSuchObjectException;
-
 import com.sun.s1asdev.ejb.timer.sessiontimersecurity.TimerSession;
 import com.sun.s1asdev.ejb.timer.sessiontimersecurity.TimerSessionHome;
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;

appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/create_resources.asadmin

diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/create_resources.asadmin b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/create_resources.asadmin
index f2a222e..bf8cdd6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/create_resources.asadmin
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/create_resources.asadmin
@@ -1,7 +1,7 @@
-create-jms-resource --restype javax.jms.QueueConnectionFactory jms/ejb_timer_sessiontimersecurity_TQCF
+create-jms-resource --restype jakarta.jms.QueueConnectionFactory jms/ejb_timer_sessiontimersecurity_TQCF
 
 create-jmsdest --desttype queue ejb_timer_sessiontimersecurity_TQueue
-create-jms-resource --restype javax.jms.Queue --property imqDestinationName=ejb_timer_sessiontimersecurity_TQueue jms/ejb_timer_sessiontimersecurity_TQueue
+create-jms-resource --restype jakarta.jms.Queue --property imqDestinationName=ejb_timer_sessiontimersecurity_TQueue jms/ejb_timer_sessiontimersecurity_TQueue
 
 
 quit

appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/descriptor/ejb-jar.xml

diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/descriptor/ejb-jar.xml
index 4192481..c50a697 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/descriptor/ejb-jar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -30,13 +30,13 @@
       <resource-ref>
         <description>description</description>
         <res-ref-name>jms/MyQueueConnectionFactory</res-ref-name>
-        <res-type>javax.jms.QueueConnectionFactory</res-type>
+        <res-type>jakarta.jms.QueueConnectionFactory</res-type>
         <res-auth>Container</res-auth>
         <res-sharing-scope>Shareable</res-sharing-scope>
       </resource-ref>
       <resource-env-ref>
          <resource-env-ref-name>jms/MyQueue</resource-env-ref-name>
-         <resource-env-ref-type>javax.jms.Queue</resource-env-ref-type>
+         <resource-env-ref-type>jakarta.jms.Queue</resource-env-ref-type>
       </resource-env-ref>
       <security-role-ref>
         <role-name>foo</role-name>

appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/ejb/TimerSessionEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/ejb/TimerSessionEJB.java b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/ejb/TimerSessionEJB.java
index 1be0d9f..5339924 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/ejb/TimerSessionEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/ejb/TimerSessionEJB.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -22,16 +22,15 @@
 import javax.ejb.TimerService;
 import javax.ejb.SessionBean;
 import javax.ejb.SessionContext;
-import javax.ejb.EJBContext;
-import javax.jms.Session;
+import jakarta.jms.Session;
 import java.rmi.RemoteException;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.QueueConnection;
-import javax.jms.Queue;
-import javax.jms.QueueSender;
-import javax.jms.QueueSession;
-import javax.jms.JMSException;
-import javax.jms.TextMessage;
+import jakarta.jms.QueueConnectionFactory;
+import jakarta.jms.QueueConnection;
+import jakarta.jms.Queue;
+import jakarta.jms.QueueSender;
+import jakarta.jms.QueueSession;
+import jakarta.jms.JMSException;
+import jakarta.jms.TextMessage;
 import javax.naming.*;
 
 public class TimerSessionEJB implements TimedObject, SessionBean 

appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/client/Client.java
index 4f5ff32..8dcda82 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/client/Client.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -18,12 +18,10 @@
 
 import java.util.ArrayList;
 
-import java.io.Serializable;
 import javax.naming.*;
-import javax.jms.*;
+import jakarta.jms.*;
 import javax.ejb.*;
 import javax.rmi.PortableRemoteObject;
-import java.rmi.NoSuchObjectException;
 
 import com.sun.s1asdev.ejb.timer.timerserialization.ejb.TimerSFSBHome;
 import com.sun.s1asdev.ejb.timer.timerserialization.ejb.TimerSFSB;

appserver/tests/appserv-tests/devtests/ejb/timer/timertests/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/client/Client.java
index 4bbc069..15d259e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/client/Client.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -17,13 +17,9 @@
 package com.sun.s1asdev.ejb.timer.timertests.client;
 
 import java.io.Serializable;
-import java.rmi.NoSuchObjectException;
 import java.util.Date;
-import java.util.Properties;
-import java.util.Set;
 
 import javax.ejb.*;
-//import javax.jms.*;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;
 

appserver/tests/appserv-tests/devtests/ejb/timer/timertests/create_resources.asadmin

diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/create_resources.asadmin b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/create_resources.asadmin
index 86d58dd..a8ff0d6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/create_resources.asadmin
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/create_resources.asadmin
@@ -1,10 +1,10 @@
-create-jms-resource --restype javax.jms.QueueConnectionFactory  jms/ejb_timer_timertests_QCF
-create-jms-resource --restype javax.jms.TopicConnectionFactory  jms/ejb_timer_timertests_TCF
+create-jms-resource --restype jakarta.jms.QueueConnectionFactory  jms/ejb_timer_timertests_QCF
+create-jms-resource --restype jakarta.jms.TopicConnectionFactory  jms/ejb_timer_timertests_TCF
 
-create-jms-resource --restype javax.jms.Queue --enabled=true --property imqDestinationName=ejb_timer_timertests_queue jms/ejb_timer_timertests_queue
-create-jms-resource --restype javax.jms.Topic --enabled=true --property imqDestinationName=ejb_timer_timertests_topic jms/ejb_timer_timertests_topic
-create-jms-resource --restype javax.jms.Queue --enabled=true --property imqDestinationName=ejb_timer_timertests_mdb_cmt jms/ejb_timer_timertests_mdb_cmt
-create-jms-resource --restype javax.jms.Queue --enabled=true --property imqDestinationName=ejb_timer_timertests_mdb_bmt jms/ejb_timer_timertests_mdb_bmt
+create-jms-resource --restype jakarta.jms.Queue --enabled=true --property imqDestinationName=ejb_timer_timertests_queue jms/ejb_timer_timertests_queue
+create-jms-resource --restype jakarta.jms.Topic --enabled=true --property imqDestinationName=ejb_timer_timertests_topic jms/ejb_timer_timertests_topic
+create-jms-resource --restype jakarta.jms.Queue --enabled=true --property imqDestinationName=ejb_timer_timertests_mdb_cmt jms/ejb_timer_timertests_mdb_cmt
+create-jms-resource --restype jakarta.jms.Queue --enabled=true --property imqDestinationName=ejb_timer_timertests_mdb_bmt jms/ejb_timer_timertests_mdb_bmt
 
 create-jmsdest --desttype queue ejb_timer_timertests_queue
 create-jmsdest --desttype topic ejb_timer_timertests_topic

appserver/tests/appserv-tests/devtests/ejb/timer/timertests/descriptor/application-client.xml

diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/descriptor/application-client.xml b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/descriptor/application-client.xml
index 1af140a..1ba18ae 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/descriptor/application-client.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/descriptor/application-client.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -57,27 +57,27 @@
 <!--
   <resource-ref>
     <res-ref-name>jms/MyTopicConnectionFactory</res-ref-name>
-    <res-type>javax.jms.TopicConnectionFactory</res-type>
+    <res-type>jakarta.jms.TopicConnectionFactory</res-type>
     <res-auth>Container</res-auth>
     <res-sharing-scope>Shareable</res-sharing-scope>
   </resource-ref>
   <resource-ref>
     <res-ref-name>jms/MyQueueConnectionFactory</res-ref-name>
-    <res-type>javax.jms.QueueConnectionFactory</res-type>
+    <res-type>jakarta.jms.QueueConnectionFactory</res-type>
     <res-auth>Container</res-auth>
     <res-sharing-scope>Shareable</res-sharing-scope>
   </resource-ref>
   <message-destination-ref>       
     <description>timertest destination</description>
     <message-destination-ref-name>jms/TimerMDBQueue_CMT</message-destination-ref-name>
-    <message-destination-type>javax.jms.Queue</message-destination-type>
+    <message-destination-type>jakarta.jms.Queue</message-destination-type>
     <message-destination-usage>Produces</message-destination-usage>
     <message-destination-link>TimerMDBQueue_CMT</message-destination-link>
   </message-destination-ref>
   <message-destination-ref>       
     <description>timertest destination</description>
     <message-destination-ref-name>jms/TimerMDBQueue_BMT</message-destination-ref-name>
-    <message-destination-type>javax.jms.Queue</message-destination-type>
+    <message-destination-type>jakarta.jms.Queue</message-destination-type>
     <message-destination-usage>Produces</message-destination-usage>
     <message-destination-link>TimerMDBQueue_BMT</message-destination-link>
   </message-destination-ref>

appserver/tests/appserv-tests/devtests/ejb/timer/timertests/descriptor/ejb-jar.xml

diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/descriptor/ejb-jar.xml
index e38cfb5..6c4ed22 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/descriptor/ejb-jar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -48,14 +48,14 @@
       <resource-ref>
         <description>description</description>
         <res-ref-name>jms/MyQueueConnectionFactory</res-ref-name>
-        <res-type>javax.jms.QueueConnectionFactory</res-type>
+        <res-type>jakarta.jms.QueueConnectionFactory</res-type>
         <res-auth>Container</res-auth>
         <res-sharing-scope>Shareable</res-sharing-scope>
       </resource-ref>
       <message-destination-ref>
         <description>timertest destination</description>
         <message-destination-ref-name>jms/MyQueue</message-destination-ref-name>
-        <message-destination-type>javax.jms.Queue</message-destination-type>
+        <message-destination-type>jakarta.jms.Queue</message-destination-type>
         <message-destination-usage>ConsumesProduces</message-destination-usage>
         <message-destination-link>TimerQueue</message-destination-link>
       </message-destination-ref>
@@ -69,9 +69,9 @@
     <message-driven>
       <ejb-name>msgbean_BMT</ejb-name>
       <ejb-class>com.sun.s1asdev.ejb.timer.timertests.MessageDrivenEJB</ejb-class>
-      <messaging-type>javax.jms.MessageListener</messaging-type>
+      <messaging-type>jakarta.jms.MessageListener</messaging-type>
       <transaction-type>Bean</transaction-type>
-      <message-destination-type>javax.jms.Queue</message-destination-type>
+      <message-destination-type>jakarta.jms.Queue</message-destination-type>
       <message-destination-link>TimerMDBQueue_BMT</message-destination-link>
       <env-entry>
         <env-entry-name>txmode</env-entry-name>
@@ -81,14 +81,14 @@
       <resource-ref>
         <description>description</description>
         <res-ref-name>jms/MyQueueConnectionFactory</res-ref-name>
-        <res-type>javax.jms.QueueConnectionFactory</res-type>
+        <res-type>jakarta.jms.QueueConnectionFactory</res-type>
         <res-auth>Container</res-auth>
         <res-sharing-scope>Shareable</res-sharing-scope>
       </resource-ref>
       <message-destination-ref>       
         <description>timertest destination</description>
         <message-destination-ref-name>jms/MyQueue</message-destination-ref-name>
-        <message-destination-type>javax.jms.Queue</message-destination-type>
+        <message-destination-type>jakarta.jms.Queue</message-destination-type>
         <message-destination-usage>ConsumesProduces</message-destination-usage>
         <message-destination-link>TimerQueue</message-destination-link>
       </message-destination-ref>
@@ -96,9 +96,9 @@
     <message-driven>
       <ejb-name>msgbean_CMT</ejb-name>
       <ejb-class>com.sun.s1asdev.ejb.timer.timertests.MessageDrivenEJB</ejb-class>
-      <messaging-type>javax.jms.MessageListener</messaging-type>
+      <messaging-type>jakarta.jms.MessageListener</messaging-type>
       <transaction-type>Container</transaction-type>
-      <message-destination-type>javax.jms.Queue</message-destination-type>
+      <message-destination-type>jakarta.jms.Queue</message-destination-type>
       <message-destination-link>TimerMDBQueue_CMT</message-destination-link>
       <env-entry>
         <env-entry-name>txmode</env-entry-name>
@@ -108,14 +108,14 @@
       <resource-ref>
         <description>description</description>
         <res-ref-name>jms/MyQueueConnectionFactory</res-ref-name>
-        <res-type>javax.jms.QueueConnectionFactory</res-type>
+        <res-type>jakarta.jms.QueueConnectionFactory</res-type>
         <res-auth>Container</res-auth>
         <res-sharing-scope>Shareable</res-sharing-scope>
       </resource-ref>
       <message-destination-ref>       
         <description>timertest destination</description>
         <message-destination-ref-name>jms/MyQueue</message-destination-ref-name>
-        <message-destination-type>javax.jms.Queue</message-destination-type>
+        <message-destination-type>jakarta.jms.Queue</message-destination-type>
         <message-destination-usage>ConsumesProduces</message-destination-usage>
         <message-destination-link>TimerQueue</message-destination-link>
       </message-destination-ref>
@@ -137,14 +137,14 @@
       <resource-ref>
         <description>description</description>
         <res-ref-name>jms/MyQueueConnectionFactory</res-ref-name>
-        <res-type>javax.jms.QueueConnectionFactory</res-type>
+        <res-type>jakarta.jms.QueueConnectionFactory</res-type>
         <res-auth>Container</res-auth>
         <res-sharing-scope>Shareable</res-sharing-scope>
       </resource-ref>
       <message-destination-ref>       
         <description>timertest destination</description>
         <message-destination-ref-name>jms/MyQueue</message-destination-ref-name>
-        <message-destination-type>javax.jms.Queue</message-destination-type>
+        <message-destination-type>jakarta.jms.Queue</message-destination-type>
         <message-destination-usage>ConsumesProduces</message-destination-usage>
         <message-destination-link>TimerQueue</message-destination-link>
       </message-destination-ref>
@@ -169,14 +169,14 @@
       <resource-ref>
         <description>description</description>
         <res-ref-name>jms/MyQueueConnectionFactory</res-ref-name>
-        <res-type>javax.jms.QueueConnectionFactory</res-type>
+        <res-type>jakarta.jms.QueueConnectionFactory</res-type>
         <res-auth>Container</res-auth>
         <res-sharing-scope>Shareable</res-sharing-scope>
       </resource-ref>
       <message-destination-ref>       
         <description>timertest destination</description>
         <message-destination-ref-name>jms/MyQueue</message-destination-ref-name>
-        <message-destination-type>javax.jms.Queue</message-destination-type>
+        <message-destination-type>jakarta.jms.Queue</message-destination-type>
         <message-destination-usage>ConsumesProduces</message-destination-usage>
         <message-destination-link>TimerQueue</message-destination-link>
       </message-destination-ref>
@@ -201,14 +201,14 @@
       <resource-ref>
         <description>description</description>
         <res-ref-name>jms/MyQueueConnectionFactory</res-ref-name>
-        <res-type>javax.jms.QueueConnectionFactory</res-type>
+        <res-type>jakarta.jms.QueueConnectionFactory</res-type>
         <res-auth>Container</res-auth>
         <res-sharing-scope>Shareable</res-sharing-scope>
       </resource-ref>
       <message-destination-ref>       
         <description>timertest destination</description>
         <message-destination-ref-name>jms/MyQueue</message-destination-ref-name>
-        <message-destination-type>javax.jms.Queue</message-destination-type>
+        <message-destination-type>jakarta.jms.Queue</message-destination-type>
         <message-destination-usage>ConsumesProduces</message-destination-usage>
         <message-destination-link>TimerQueue</message-destination-link>
       </message-destination-ref>
@@ -233,14 +233,14 @@
       <resource-ref>
         <description>description</description>
         <res-ref-name>jms/MyQueueConnectionFactory</res-ref-name>
-        <res-type>javax.jms.QueueConnectionFactory</res-type>
+        <res-type>jakarta.jms.QueueConnectionFactory</res-type>
         <res-auth>Container</res-auth>
         <res-sharing-scope>Shareable</res-sharing-scope>
       </resource-ref>
       <message-destination-ref>       
         <description>timertest destination</description>
         <message-destination-ref-name>jms/MyQueue</message-destination-ref-name>
-        <message-destination-type>javax.jms.Queue</message-destination-type>
+        <message-destination-type>jakarta.jms.Queue</message-destination-type>
         <message-destination-usage>ConsumesProduces</message-destination-usage>
         <message-destination-link>TimerQueue</message-destination-link>
       </message-destination-ref>
@@ -265,14 +265,14 @@
       <resource-ref>
         <description>description</description>
         <res-ref-name>jms/MyQueueConnectionFactory</res-ref-name>
-        <res-type>javax.jms.QueueConnectionFactory</res-type>
+        <res-type>jakarta.jms.QueueConnectionFactory</res-type>
         <res-auth>Container</res-auth>
         <res-sharing-scope>Shareable</res-sharing-scope>
       </resource-ref>
       <message-destination-ref>       
         <description>timertest destination</description>
         <message-destination-ref-name>jms/MyQueue</message-destination-ref-name>
-        <message-destination-type>javax.jms.Queue</message-destination-type>
+        <message-destination-type>jakarta.jms.Queue</message-destination-type>
         <message-destination-usage>ConsumesProduces</message-destination-usage>
         <message-destination-link>TimerQueue</message-destination-link>
       </message-destination-ref>
@@ -289,7 +289,7 @@
         <ejb-name>msgbean_CMT</ejb-name>
         <method-name>onMessage</method-name>
         <method-params>
-          <method-param>javax.jms.Message</method-param>
+          <method-param>jakarta.jms.Message</method-param>
         </method-params>
       </method>
       <trans-attribute>Required</trans-attribute>

appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/MessageDrivenEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/MessageDrivenEJB.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/MessageDrivenEJB.java
index 6fb3762..28cad04 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/MessageDrivenEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/MessageDrivenEJB.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -17,9 +17,8 @@
 package com.sun.s1asdev.ejb.timer.timertests;
 
 import java.rmi.RemoteException;
-import javax.jms.*;
+import jakarta.jms.*;
 import javax.ejb.*;
-import java.io.Serializable;
 
 public class MessageDrivenEJB extends TimerStuffImpl 
     implements MessageDrivenBean, TimedObject, MessageListener {

appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/TimerStuffImpl.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/TimerStuffImpl.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/TimerStuffImpl.java
index 31ca6a6..484a5d6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/TimerStuffImpl.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/TimerStuffImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -24,14 +24,14 @@
 import java.util.Collection;
 import java.util.Iterator;
 import javax.ejb.*;
-import javax.jms.JMSException;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.QueueConnection;
-import javax.jms.Queue;
-import javax.jms.QueueSession;
-import javax.jms.QueueSender;
-import javax.jms.QueueReceiver;
-import javax.jms.TextMessage;
+import jakarta.jms.JMSException;
+import jakarta.jms.QueueConnectionFactory;
+import jakarta.jms.QueueConnection;
+import jakarta.jms.Queue;
+import jakarta.jms.QueueSession;
+import jakarta.jms.QueueSender;
+import jakarta.jms.QueueReceiver;
+import jakarta.jms.TextMessage;
 
 public class TimerStuffImpl implements TimerStuff {
     

appserver/tests/appserv-tests/devtests/ejb/util/methodmap/client/MethodMapTest.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/client/MethodMapTest.java b/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/client/MethodMapTest.java
index cf1aac7..b5d7152 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/client/MethodMapTest.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/client/MethodMapTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -38,8 +38,8 @@
         javax.ejb.EJBObject.class, javax.ejb.EJBLocalObject.class,
         javax.ejb.EJBLocalHome.class, javax.ejb.SessionBean.class,
         javax.ejb.EnterpriseBean.class, java.util.Map.class,
-        javax.jms.QueueConnection.class, javax.jms.QueueSession.class,
-        javax.jms.Session.class, java.util.Date.class,
+        jakarta.jms.QueueConnection.class, jakarta.jms.QueueSession.class,
+        jakarta.jms.Session.class, java.util.Date.class,
         javax.swing.Action.class, javax.swing.AbstractAction.class,
         javax.swing.JComboBox.class, javax.swing.JTextArea.class