Fixes #22895 Incorporate Jakarta Messaging 3.0.0-RC1
Signed-off-by: Gaurav Gupta <gaurav.gupta@payara.fish>
diff --git a/appserver/tests/appserv-tests/devtests/security/mdb/client/Client.java b/appserver/tests/appserv-tests/devtests/security/mdb/client/Client.java
index 59b0111..ba83b08 100644
--- a/appserver/tests/appserv-tests/devtests/security/mdb/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/security/mdb/client/Client.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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 com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
@@ -46,12 +46,12 @@
private static QueueConnectionFactory queueConFactory;
@Resource(name="MsgBeanQueue", mappedName="jms/security_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;
@Resource(name="ClientQueue", mappedName="jms/security_mdb_OutQueue")
-private static javax.jms.Queue clientQueue;
+private static jakarta.jms.Queue clientQueue;
private QueueConnection queueCon;
@@ -107,7 +107,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 +
@@ -127,7 +127,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);
diff --git a/appserver/tests/appserv-tests/devtests/security/mdb/create_resources.asadmin b/appserver/tests/appserv-tests/devtests/security/mdb/create_resources.asadmin
index c2f199c..05d89fc 100644
--- a/appserver/tests/appserv-tests/devtests/security/mdb/create_resources.asadmin
+++ b/appserver/tests/appserv-tests/devtests/security/mdb/create_resources.asadmin
@@ -1,11 +1,11 @@
-create-jms-resource --restype javax.jms.QueueConnectionFactory jms/security_mdb_QCF
+create-jms-resource --restype jakarta.jms.QueueConnectionFactory jms/security_mdb_QCF
create-jmsdest --desttype queue security_mdb_InQueue
-create-jms-resource --restype javax.jms.Queue --property imqDestinationName=security_mdb__mdb_InQueue jms/security_mdb_InQueue
+create-jms-resource --restype jakarta.jms.Queue --property imqDestinationName=security_mdb__mdb_InQueue jms/security_mdb_InQueue
create-jmsdest --desttype queue security_mdb_OutQueue
-create-jms-resource --restype javax.jms.Queue --property imqDestinationName=security_mdb_OutQueue jms/security_mdb_OutQueue
+create-jms-resource --restype jakarta.jms.Queue --property imqDestinationName=security_mdb_OutQueue jms/security_mdb_OutQueue
quit
diff --git a/appserver/tests/appserv-tests/devtests/security/mdb/ejb/MessageBean.java b/appserver/tests/appserv-tests/devtests/security/mdb/ejb/MessageBean.java
index c71d098..d3eab37 100644
--- a/appserver/tests/appserv-tests/devtests/security/mdb/ejb/MessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/security/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
@@ -25,15 +25,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;
import javax.annotation.security.RunAs;
