format and organize imports.

Signed-off-by: Gurunandan Rao <[email protected]>

glassfish-runner/jms-tck/pom.xml

@@ -532,7 +532,6 @@
                             </excludes>
                             <additionalClasspathElements>
                                 <additionalClasspathElement>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.jms-api.jar</additionalClasspathElement>
-                                <additionalClasspathElement>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jms-core.jar</additionalClasspathElement>
                                 <additionalClasspathElement>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/glassfish-corba-omgapi.jar</additionalClasspathElement>
                                 <additionalClasspathElement>${project.build.directory}/${glassfish.toplevel.dir}/javadb/lib/derbyclient.jar</additionalClasspathElement>
                                 <additionalClasspathElement>${project.build.directory}/${glassfish.toplevel.dir}/javadb/lib/derby.jar</additionalClasspathElement>
@@ -552,6 +551,7 @@
                                 <webServerHost>localhost</webServerHost>
                                 <webServerPort>8080</webServerPort>
                                 <vehicle>standalone</vehicle>
+                                <user.dir>/tmp</user.dir>
                             </systemPropertyVariables>
                             <environmentVariables>
                                 <GLASSFISH_HOME>${project.build.directory}/${glassfish.toplevel.dir}</GLASSFISH_HOME>

glassfish-runner/pom.xml

@@ -39,6 +39,14 @@
     <properties>
         <glassfish-artifact-id>glassfish</glassfish-artifact-id>
 
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+
+        <jsonb.tck.version>3.0.0</jsonb.tck.version>
+        <json.tck.version>2.1.0</json.tck.version>
+        <jakarta.rest.version>3.1.0</jakarta.rest.version>
+        <tck.artifactId>jakarta-restful-ws-tck</tck.artifactId>
+
         <glassfish.container.version>7.0.0</glassfish.container.version>
         <glassfish.toplevel.dir>glassfish7</glassfish.toplevel.dir>
         <jakarta.rest.version>3.1.0</jakarta.rest.version>

jms/src/main/java/com/sun/ts/lib/implementation/sun/jms/SunRIJMSObjects.java

@@ -16,12 +16,16 @@
 
 package com.sun.ts.lib.implementation.sun.jms;
 
-import java.util.*;
-import java.io.*;
-import javax.naming.*;
-import jakarta.jms.*;
-import com.sun.ts.lib.util.*;
-import com.sun.ts.lib.porting.*;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+
+import com.sun.ts.lib.porting.TSJMSObjectsInterface;
+import com.sun.ts.lib.util.TestUtil;
+
+import jakarta.jms.ConnectionFactory;
+import jakarta.jms.QueueConnectionFactory;
+import jakarta.jms.Topic;
+import jakarta.jms.TopicConnectionFactory;
 
 /**
  * This is an implementation of the TSJMSObjectsInterface. An implementation of
@@ -32,118 +36,116 @@
  */
 
 public class SunRIJMSObjects implements TSJMSObjectsInterface {
-  private static Context jndiContext = null;
-
-  private static QueueConnectionFactory qcf = null;
-
-  private static TopicConnectionFactory tcf = null;
-
-  private static ConnectionFactory cf = null;
-
-  private jakarta.jms.Topic testTopic = null;
-
-  private jakarta.jms.Queue testQueue = null;
-
-  private void getJNDIContext() throws Exception {
-
-    if (jndiContext == null) {
-      try {
-        TestUtil.logTrace("Getting initial context");
-        jndiContext = new InitialContext();
-      } catch (javax.naming.NamingException ne) {
-        TestUtil.logErr("Could not create JNDI context because: ", ne);
-        TestUtil.printStackTrace(ne);
-        throw ne;
-      }
-    }
-  }
-
-  /**
-   * This method allows individual implementation to get the Queue
-   */
-
-  public jakarta.jms.Queue getQueue(String name) throws Exception {
-    getJNDIContext();
-
-    try {
-      testQueue = (jakarta.jms.Queue) jndiContext.lookup(name);
-    } catch (Exception e) {
-      TestUtil.logErr("Failed to lookup Queue");
-      TestUtil.printStackTrace(e);
-      throw e;
-    }
-    return testQueue;
-  }
-
-  /**
-   * This method allows individual implementation to get the Topic
-   */
-
-  public Topic getTopic(String name) throws Exception {
-    getJNDIContext();
-
-    try {
-      testTopic = (Topic) jndiContext.lookup(name);
-    } catch (Exception e) {
-      TestUtil.logErr("Failed to lookup Topic");
-      TestUtil.printStackTrace(e);
-      throw e;
-    }
-    return testTopic;
-  }
-
-  /**
-   * This method allows individual implementation to get the
-   * QueueConnectionFactory
-   */
-
-  public QueueConnectionFactory getQueueConnectionFactory(String name)
-      throws Exception {
-    getJNDIContext();
-
-    try {
-      qcf = (QueueConnectionFactory) jndiContext.lookup(name);
-    } catch (Exception e) {
-      TestUtil.logErr("Failed to lookup QueueConnectionFactory");
-      TestUtil.printStackTrace(e);
-      throw e;
-    }
-    return qcf;
-  }
-
-  /**
-   * This method allows individual implementation to get the
-   * TopicConnectionFactory
-   */
-
-  public TopicConnectionFactory getTopicConnectionFactory(String name)
-      throws Exception {
-    getJNDIContext();
-
-    try {
-      tcf = (TopicConnectionFactory) jndiContext.lookup(name);
-    } catch (Exception e) {
-      TestUtil.logErr("Failed to lookup TopicConnectionFactory");
-      TestUtil.printStackTrace(e);
-      throw e;
-    }
-    return tcf;
-  }
-
-  /**
-   * This method allows individual implementation to get the ConnectionFactory
-   */
-
-  public ConnectionFactory getConnectionFactory(String name) throws Exception {
-    getJNDIContext();
-
-    try {
-      cf = (ConnectionFactory) jndiContext.lookup(name);
-    } catch (Exception e) {
-      TestUtil.logErr("Failed to lookup ConnectionFactory");
-      TestUtil.printStackTrace(e);
-      throw e;
-    }
-    return cf;
-  }
+	private static Context jndiContext = null;
+
+	private static QueueConnectionFactory qcf = null;
+
+	private static TopicConnectionFactory tcf = null;
+
+	private static ConnectionFactory cf = null;
+
+	private jakarta.jms.Topic testTopic = null;
+
+	private jakarta.jms.Queue testQueue = null;
+
+	private void getJNDIContext() throws Exception {
+
+		if (jndiContext == null) {
+			try {
+				TestUtil.logTrace("Getting initial context");
+				jndiContext = new InitialContext();
+			} catch (javax.naming.NamingException ne) {
+				TestUtil.logErr("Could not create JNDI context because: ", ne);
+				TestUtil.printStackTrace(ne);
+				throw ne;
+			}
+		}
+	}
+
+	/**
+	 * This method allows individual implementation to get the Queue
+	 */
+
+	public jakarta.jms.Queue getQueue(String name) throws Exception {
+		getJNDIContext();
+
+		try {
+			testQueue = (jakarta.jms.Queue) jndiContext.lookup(name);
+		} catch (Exception e) {
+			TestUtil.logErr("Failed to lookup Queue");
+			TestUtil.printStackTrace(e);
+			throw e;
+		}
+		return testQueue;
+	}
+
+	/**
+	 * This method allows individual implementation to get the Topic
+	 */
+
+	public Topic getTopic(String name) throws Exception {
+		getJNDIContext();
+
+		try {
+			testTopic = (Topic) jndiContext.lookup(name);
+		} catch (Exception e) {
+			TestUtil.logErr("Failed to lookup Topic");
+			TestUtil.printStackTrace(e);
+			throw e;
+		}
+		return testTopic;
+	}
+
+	/**
+	 * This method allows individual implementation to get the
+	 * QueueConnectionFactory
+	 */
+
+	public QueueConnectionFactory getQueueConnectionFactory(String name) throws Exception {
+		getJNDIContext();
+
+		try {
+			qcf = (QueueConnectionFactory) jndiContext.lookup(name);
+		} catch (Exception e) {
+			TestUtil.logErr("Failed to lookup QueueConnectionFactory");
+			TestUtil.printStackTrace(e);
+			throw e;
+		}
+		return qcf;
+	}
+
+	/**
+	 * This method allows individual implementation to get the
+	 * TopicConnectionFactory
+	 */
+
+	public TopicConnectionFactory getTopicConnectionFactory(String name) throws Exception {
+		getJNDIContext();
+
+		try {
+			tcf = (TopicConnectionFactory) jndiContext.lookup(name);
+		} catch (Exception e) {
+			TestUtil.logErr("Failed to lookup TopicConnectionFactory");
+			TestUtil.printStackTrace(e);
+			throw e;
+		}
+		return tcf;
+	}
+
+	/**
+	 * This method allows individual implementation to get the ConnectionFactory
+	 */
+
+	public ConnectionFactory getConnectionFactory(String name) throws Exception {
+		getJNDIContext();
+
+		try {
+			cf = (ConnectionFactory) jndiContext.lookup(name);
+		} catch (Exception e) {
+			TestUtil.logErr("Failed to lookup ConnectionFactory");
+			TestUtil.printStackTrace(e);
+			throw e;
+		}
+		return cf;
+	}
 }

jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedQueueConnection/ClosedQueueConnectionTestsIT.java

@@ -43,6 +43,7 @@
 /**
  * JMS TS tests. Testing method calls on closed QueueConnection objects.
  */
+
 public class ClosedQueueConnectionTestsIT {
 	private static final String TestName = "com.sun.ts.tests.jms.core.appclient.closedQueueConnection.ClosedQueueConnectionTestsIT";
 

jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedQueueReceiver/ClosedQueueReceiverIT.java

@@ -33,6 +33,7 @@
 import jakarta.jms.Message;
 import jakarta.jms.MessageListener;
 
+
 public class ClosedQueueReceiverIT {
 	private static final String TestName = "com.sun.ts.tests.jms.core.appclient.closedQueueReceiver.ClosedQueueReceiverTestsIT";
 

jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedQueueSession/ClosedQueueSessionTestsIT.java

@@ -36,6 +36,7 @@
 /**
  * JMS TS tests. Testing method calls on closed QueueSession objects.
  */
+
 public class ClosedQueueSessionTestsIT {
 	private static final String TestName = "com.sun.ts.tests.jms.core.appclient.closedQueueSession.ClosedQueueSessionTests";
 

jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedTopicConnection/ClosedTopicConnectionTestsIT.java

@@ -38,6 +38,7 @@
 /**
  * JMS product tests. Testing method calls on closed TopicConnection objects.
  */
+
 public class ClosedTopicConnectionTestsIT {
 	private static final String TestName = "com.sun.ts.tests.jms.core.appclient.closedTopicConnection.ClosedTopicConnectionTestsIT";
 

jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedTopicSession/ClosedTopicSessionTestsIT.java

@@ -33,6 +33,7 @@
 import jakarta.jms.Message;
 import jakarta.jms.MessageListener;
 
+
 public class ClosedTopicSessionTestsIT {
 	private static final String testName = "com.sun.ts.tests.jms.ee.ejbjspservlet.closedTopicSession.ClosedTopicSessionTestsIT";
 

jms/src/main/java/com/sun/ts/tests/jms/core/appclient/invalidDest/InvalidDestTestsIT.java

@@ -34,6 +34,7 @@
 import jakarta.jms.Session;
 import jakarta.jms.Topic;
 
+
 public class InvalidDestTestsIT {
 	private static final String testName = "com.sun.ts.tests.jms.core.appclient.invalidDest.InvalidDestTestsIT";
 

jms/src/main/java/com/sun/ts/tests/jms/core/appclient/queueconn/QueueConnTestsIT.java

@@ -37,6 +37,7 @@
 import jakarta.jms.Session;
 import jakarta.jms.TextMessage;
 
+
 public class QueueConnTestsIT {
 	private static final String testName = "com.sun.ts.tests.jms.core.appclient.queueconn.QueueConnTestsIT";
 

jms/src/main/java/com/sun/ts/tests/jms/core/appclient/queuetests/QueueTestsIT.java

@@ -50,6 +50,7 @@
 import jakarta.jms.TextMessage;
 import jakarta.jms.TopicConnection;
 
+
 public class QueueTestsIT {
 	private static final String testName = "com.sun.ts.tests.jms.core.appclient.queuetests.QueueTestsIT";
 

jms/src/main/java/com/sun/ts/tests/jms/core/appclient/topictests/TopicTestsIT.java

@@ -50,6 +50,7 @@
 import jakarta.jms.TopicSession;
 import jakarta.jms.TopicSubscriber;
 
+
 public class TopicTestsIT {
 	private static final String testName = "com.sun.ts.tests.jms.core.appclient.topictests.TopicTestsIT";
 

jms/src/main/java/com/sun/ts/tests/jms/core/appclient/txtopictests/TxTopicTestsIT.java

@@ -43,6 +43,7 @@
 import jakarta.jms.TopicSession;
 import jakarta.jms.TopicSubscriber;
 
+
 public class TxTopicTestsIT {
 	private static final String testName = "com.sun.ts.tests.jms.ee.ejbjspservlet.txtopictests.TxTopicTestsIT";
 

jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgQueue/BytesMsgQueueTestsIT.java

@@ -33,6 +33,7 @@
 import jakarta.jms.BytesMessage;
 import jakarta.jms.MessageNotWriteableException;
 
+
 public class BytesMsgQueueTestsIT {
 	private static final String testName = "com.sun.ts.tests.jms.core.bytesMsgQueue.BytesMsgQueueTestsIT";
 

jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgTopic/BytesMsgTopicTestsIT.java

@@ -33,6 +33,7 @@
 import jakarta.jms.BytesMessage;
 import jakarta.jms.MessageNotWriteableException;
 
+
 public class BytesMsgTopicTestsIT {
 	private static final String testName = "com.sun.ts.tests.jms.core.bytesMsgTopic.BytesMsgTopicTestsIT";
 

jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueConnection/ClosedQueueConnectionTestsIT.java

@@ -49,6 +49,7 @@
 /**
  * JMS TS tests. Testing method calls on closed QueueConnection objects.
  */
+
 public class ClosedQueueConnectionTestsIT {
 	private static final String TestName = "com.sun.ts.tests.jms.core.closedQueueConnection.ClosedQueueConnectionTestsIT";
 

jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueReceiver/ClosedQueueReceiverTestsIT.java

@@ -36,6 +36,7 @@
 /**
  * JMS TS tests. Testing method calls on closed QueueReceiver objects.
  */
+
 public class ClosedQueueReceiverTestsIT {
 	private static final String TestName = "com.sun.ts.tests.jms.core.closedQueueReceiver.ClosedQueueReceiverTestsIT";