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/transaction/ee/dblogs/mdb/client/Client.java b/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/client/Client.java index a6a09a6..8a23176 100644 --- a/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/client/Client.java +++ b/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/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 @@ -59,9 +59,9 @@ asadmin("create-local-instance", "--cluster", CLUSTER_NAME, INSTANCE1_NAME); asadmin("create-local-instance", "--cluster", CLUSTER_NAME, INSTANCE2_NAME); System.out.println("Creating JMS resources"); - asadmin("create-jms-resource", "--target", CLUSTER_NAME, "--restype", "javax.jms.QueueConnectionFactory", "jms/ejb_mdb_QCF"); + asadmin("create-jms-resource", "--target", CLUSTER_NAME, "--restype", "jakarta.jms.QueueConnectionFactory", "jms/ejb_mdb_QCF"); asadmin("create-jmsdest", "--target", CLUSTER_NAME, "--desttype", "ejb_mdb_Queue"); - asadmin("create-jms-resource", "--target", CLUSTER_NAME, "--restype", "javax.jms.Queue", "--property", "imqDestinationName=ejb_mdb_Queue", "jms/ejb_mdb_Queue"); + asadmin("create-jms-resource", "--target", CLUSTER_NAME, "--restype", "jakarta.jms.Queue", "--property", "imqDestinationName=ejb_mdb_Queue", "jms/ejb_mdb_Queue"); System.out.println("Finished creating JMS resources"); if (Boolean.getBoolean("enableShoalLogger")) {
diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/war/MdBean.java b/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/war/MdBean.java index 87421d7..22d28b7 100644 --- a/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/war/MdBean.java +++ b/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/war/MdBean.java
@@ -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 com.acme; import javax.ejb.*; -import javax.jms.*; +import jakarta.jms.*; /** *
diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/war/MyBean.java b/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/war/MyBean.java index 5524f6d..2f9c8ec 100644 --- a/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/war/MyBean.java +++ b/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/war/MyBean.java
@@ -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,10 +22,8 @@ package com.acme; import java.sql.*; -import java.util.Set; -import java.util.HashSet; import javax.ejb.*; -import javax.jms.*; +import jakarta.jms.*; import javax.sql.DataSource; import javax.naming.InitialContext; import javax.annotation.Resource;