jaxws failure with GF 6.1 and JDK 11 fix.

Signed-off-by: gurunandan.rao@oracle.com <gurunandan.rao@oracle.com>
scottmarlow · Mar 16, 2021 · 4872f0e · 4872f0e
1 parent ef2de16
commit 4872f0e
Show file tree

Hide file tree

Showing 491 changed files with 4,381 additions and 3,174 deletions.
diff --git a/docker/build_standalone-tcks.sh b/docker/build_standalone-tcks.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -xe
 
-# Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2021 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
@@ -187,7 +187,6 @@ for tck in ${TCK_LIST[@]}; do
     JAXWS_SPECIFIC_PROPS=""
   elif [ "jaxws" == "$tck" ]
   then
-    sed -i -e 's#tools\.jar=.*#tools.jar='${GF_HOME//\//\\\/}'\/$GF_TOPLEVEL_DIR\/glassfish\/modules\/webservices-tools.jar:'${GF_HOME//\//\\\/}'\/$GF_TOPLEVEL_DIR\/glassfish\/modules\/webservices-api.jar#g' $BASEDIR/install/$tck/bin/ts.jte
     TCK_SPECIFIC_PROPS="-Dwebcontainer.home=$BASEDIR/$GF_TOPLEVEL_DIR/glassfish -Dwebcontainer.home.ri=$BASEDIR/$GF_TOPLEVEL_DIR/glassfish -Ddeliverable.version=3.0"
     JAXWS_SPECIFIC_PROPS="-Dwebcontainer.home=$BASEDIR/$GF_TOPLEVEL_DIR/glassfish -Dwebcontainer.home.ri=$BASEDIR/$GF_TOPLEVEL_DIR/glassfish -Ddeliverable.version=3.0"
     DOC_SPECIFIC_PROPS=""

diff --git a/docker/jaxwstck.sh b/docker/jaxwstck.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -x
 
-# Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2021 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,7 +55,6 @@ echo "TS_HOME $TS_HOME"
 
 chmod -R 777 $TS_HOME
 cd $TS_HOME/bin
-mkdir $TCK_HOME/ri
 
 if [[ "$JDK" == "JDK11" || "$JDK" == "jdk11" ]];then
   export JAVA_HOME=${JDK11_HOME}
@@ -83,13 +82,15 @@ mkdir -p $TCK_HOME/${TCK_NAME}report/${TCK_NAME}
 mkdir -p $TCK_HOME/${TCK_NAME}work/${TCK_NAME}
 
 
-cd $TCK_HOME/vi/$GF_TOPLEVEL_DIR/glassfish/bin
+cd $TCK_HOME/$GF_TOPLEVEL_DIR/glassfish/bin
 ./asadmin start-domain
 cd $TS_HOME/bin
 ant config.vi
 
 RI_DOMAIN_CONFIG_FILE=$TCK_HOME/ri/$GF_TOPLEVEL_DIR/glassfish/domains/domain1/config/domain.xml
 rm -rf $TCK_HOME/ri/*
+mkdir $TCK_HOME/ri
+
 
 # TODO : Web Profile 
 # cp $TCK_HOME/latest-glassfish-$PROFILE.zip $BASEDIR/ri/latest-glassfish.zip
@@ -106,7 +107,7 @@ cd $TCK_HOME/ri/$GF_TOPLEVEL_DIR/glassfish/bin
 cd $TS_HOME/bin
 ant config.ri
 
-cd $TCK_HOME/vi/$GF_TOPLEVEL_DIR/glassfish/bin
+cd $TCK_HOME/$GF_TOPLEVEL_DIR/glassfish/bin
 ./asadmin stop-domain
 ./asadmin start-domain
 

diff --git a/install/jaxws/bin/ts.jte b/install/jaxws/bin/ts.jte
@@ -76,6 +76,7 @@ jaxws.lib.ri=${jaxws.home.ri}/modules
 endorsed.dirs=${jaxws.home}/modules/endorsed
 endorsed.dirs.ri=${jaxws.home.ri}/modules/endorsed
 
+
 ###########################################################################
 # @jaxws.classes  should contain all Vendor specific jars/classes
 ###########################################################################
@@ -553,3 +554,45 @@ extension.dir=${webcontainer.home}/domains/domain1/lib/ext
 extension.dir.ri=${webcontainer.home.ri}/domains/domain1/lib/ext
 
 
+#################################################################
+# To Configure config.vi with security manager
+#################################################################
+javaee.home=${webcontainer.home}
+###############################################################
+## Config params needed for Sun Java System Application Server
+## (SJSAS) asadmin. You must change these values as needed
+## only if you are testing against SJSAS app server
+## (javaee.home is pointing to SJSAS).
+#
+# @s1as.admin.user     -- The SJSAS asadmin user id
+# @s1as.admin.passwd   -- The SJSAS asadmin user password
+# @s1as.admin.host     -- The SJSAS host
+# @s1as.admin.port     -- The SJSAS port
+# @s1as.admin          -- The SJSAS admin command
+# @s1as.server         -- The SJSAS server instance being used
+# @s1as.domain.dir     -- Points to where your domains are installed.
+# @s1as.domain.name    -- The SJSAS domain being used
+# @s1as.domain         -- The SJSAS domain path being used
+# @s1as.asenv.loc      -- location of asenv.conf or asenv.bat
+# @s1as.imqbin.loc     -- location of the IMQ bin directory
+# @s1as.lib            -- Library directory for other Java EE RI
+#                         jars
+# @s1as.imq.share.lib  -- Shared library directory for imq 
+# @s1as.jvm.options    -- Java options needed by SJSAS
+#                         The xxxlogin and xxxpassword are used
+#                         to set known server side creds for use
+#                         with connector tests.
+# @s1as.java.endorsed.dirs -- endorsed directory used by SJSAS
+# @s1as.applicationRoot-- Location of application repository
+#                         Only needed when running on windows
+# @s1as.db.ext.dirs    -- The extension directory for DB Type 2
+#                         drivers.  Currently, this only needs
+#                         to be set when using DB2 else it
+#                         should be empty.
+############################################################### 
+s1as.admin=${javaee.home}/bin/asadmin
+s1as.domain.dir=${javaee.home}/domains
+s1as.domain.name=${glassfish.domain.name}
+s1as.domain=${s1as.domain.dir}/${s1as.domain.name}
+s1as.admin.host=${glassfish.admin.host}
+s1as.admin.port=${glassfish.admin.port}
diff --git a/install/jaxws/bin/ts.jte.jdk11 b/install/jaxws/bin/ts.jte.jdk11
@@ -79,13 +79,12 @@ endorsed.dirs.ri=${jaxws.lib.ri}
 ###########################################################################
 # @jaxws.classes  should contain all Vendor specific jars/classes
 ###########################################################################
-
-jaxws.classes=${jaxws.lib}/jakarta.servlet-api.jar${pathsep}${jaxws.lib}/FastInfoset.jar${pathsep}${jaxws.lib}/gmbal-api-only.jar${pathsep}${jaxws.lib}/ha-api.jar${pathsep}${jaxws.lib}/jakarta.annotation.jar${pathsep}${jaxws.lib}/jakarta.xml.soap-api.jar${pathsep}${endorsed.dirs}/jaxb-api.jar${pathsep}${jaxws.lib}/jaxb-impl.jar${pathsep}${jaxws.lib}/jaxb-xjc.jar${pathsep}${jaxws.lib}/jaxb-jxc.jar${pathsep}${jaxws.lib}/jaxb-core.jar${pathsep}${endorsed.dirs}/jaxws-api.jar${pathsep}${jaxws.lib}/jaxws-rt.jar${pathsep}${jaxws.lib}/jaxws-tools.jar${pathsep}${jaxws.lib}/jsr181-api.jar${pathsep}${jaxws.lib}/mail.jar${pathsep}${jaxws.lib}/management-api.jar${pathsep}${jaxws.lib}/mimepull.jar${pathsep}${jaxws.lib}/policy.jar${pathsep}${jaxws.lib}/resolver.jar${pathsep}${jaxws.lib}/saaj-impl.jar${pathsep}${jaxws.lib}/stax-ex.jar${pathsep}${jaxws.lib}/stax2-api.jar${pathsep}${jaxws.lib}/streambuffer.jar${pathsep}${jaxws.lib}/woodstox-core-asl.jar
+jaxws.classes=${jaxws.lib}/../lib/resolver.jar${pathsep}${jaxws.lib}/webservices-api-osgi.jar${pathsep}${jaxws.lib}/jaxb-api-osgi.jar${pathsep}${jaxws.lib}/webservices-osgi.jar${pathsep}${jaxws.lib}/jaxb-osgi.jar${pathsep}${jaxws.lib}/gmbal.jar${pathsep}${jaxws.lib}/management-api.jar${pathsep}${jaxws.lib}/mimepull.jar${pathsep}${jaxws.lib}/ha-api.jar${pathsep}${jaxws.lib}/webservices-api.jar${pathsep}${jaxws.lib}/jakarta.xml.bind-api.jar${pathsep}${jaxws.lib}/jakarta.activation.jar
 
 ###########################################################################
 # @jaxws.classes.ri  should contain all RI specific jars/classes
 ###########################################################################
-jaxws.classes.ri=${jaxws.lib.ri}/FastInfoset.jar${pathsep}${jaxws.lib.ri}/gmbal-api-only.jar${pathsep}${jaxws.lib.ri}/ha-api.jar${pathsep}${jaxws.lib.ri}/jakarta.annotation.jar${pathsep}${jaxws.lib.ri}/jakarta.xml.soap-api.jar${pathsep}${endorsed.dirs.ri}/jaxb-api.jar${pathsep}${jaxws.lib.ri}/jaxb-impl.jar${pathsep}${jaxws.lib.ri}/jaxb-xjc.jar${pathsep}${jaxws.lib.ri}/jaxb-jxc.jar${pathsep}${jaxws.lib.ri}/jaxb-core.jar${pathsep}${endorsed.dirs.ri}/jaxws-api.jar${pathsep}${jaxws.lib.ri}/jaxws-rt.jar${pathsep}${jaxws.lib.ri}/jaxws-tools.jar${pathsep}${jaxws.lib.ri}/jsr181-api.jar${pathsep}${jaxws.lib.ri}/mail.jar${pathsep}${jaxws.lib.ri}/management-api.jar${pathsep}${jaxws.lib.ri}/mimepull.jar${pathsep}${jaxws.lib.ri}/policy.jar${pathsep}${jaxws.lib.ri}/resolver.jar${pathsep}${jaxws.lib.ri}/saaj-impl.jar${pathsep}${jaxws.lib.ri}/stax-ex.jar${pathsep}${jaxws.lib.ri}/stax2-api.jar${pathsep}${jaxws.lib.ri}/streambuffer.jar${pathsep}${jaxws.lib.ri}/woodstox-core-asl.jar
+jaxws.classes.ri=${jaxws.lib.ri}/../lib/resolver.jar${pathsep}${jaxws.lib.ri}/webservices-api-osgi.jar${pathsep}${jaxws.lib.ri}/jaxb-api-osgi.jar${pathsep}${jaxws.lib.ri}/webservices-osgi.jar${pathsep}${jaxws.lib.ri}/jaxb-osgi.jar${pathsep}${jaxws.lib.ri}/gmbal.jar${pathsep}${jaxws.lib.ri}/management-api.jar${pathsep}${jaxws.lib.ri}/mimepull.jar${pathsep}${jaxws.lib.ri}/ha-api.jar${pathsep}${jaxws.lib.ri}/webservices-api.jar${pathsep}${jaxws.lib.ri}/jakarta.xml.bind-api.jar${pathsep}${jaxws.lib.ri}/jakarta.activation.jar
 
 ###########################################################################
 # @catalog.path  Path to catalog file for use with catalog tests
@@ -381,8 +380,7 @@ command.testExecute=com.sun.ts.lib.harness.ExecTSTestCmd \
 		-Djava.security.policy="${bin.dir}/harness.policy" \
 		-Djava.security.manager \
 		-Ddeliverable.class=${deliverable.class} \
-    -Djava.io.tmpdir=${harness.temp.directory} \
-    -XaddExports:java.rmi/sun.rmi.transport=ALL-UNNAMED,java.xml/com.sun.org.apache.xerces.internal.dom=ALL-UNNAMED,java.xml/com.sun.org.apache.xerces.internal.jaxp=ALL-UNNAMED,java.xml/com.sun.org.apache.xerces.internal.util=ALL-UNNAMED,java.xml/com.sun.org.apache.xml.internal.resolver=ALL-UNNAMED,java.xml/com.sun.org.apache.xml.internal.resolver.tools=ALL-UNNAMED,java.xml/com.sun.xml.internal.stream.writers=ALL-UNNAMED,java.base/sun.reflect.misc=ALL-UNNAMED \
+    	-Djava.io.tmpdir=${harness.temp.directory} \
         $testExecuteClass $testExecuteArgs
 
 # This execute line runs against the RI implementation
@@ -396,7 +394,6 @@ command.testExecute2=com.sun.ts.lib.harness.ExecTSTestCmd \
 		-Djava.security.policy="${bin.dir}/harness.policy" \
 		-Djava.security.manager \
 		-Ddeliverable.class=${deliverable.class} \
-    -XaddExports:java.rmi/sun.rmi.transport=ALL-UNNAMED,java.xml/com.sun.org.apache.xerces.internal.dom=ALL-UNNAMED,java.xml/com.sun.org.apache.xerces.internal.jaxp=ALL-UNNAMED,java.xml/com.sun.org.apache.xerces.internal.util=ALL-UNNAMED,java.xml/com.sun.org.apache.xml.internal.resolver=ALL-UNNAMED,java.xml/com.sun.org.apache.xml.internal.resolver.tools=ALL-UNNAMED,java.xml/com.sun.xml.internal.stream.writers=ALL-UNNAMED,java.base/sun.reflect.misc=ALL-UNNAMED \    
         $testExecuteClass $testExecuteArgs
 
 #########################################################################
@@ -516,5 +513,48 @@ client.delay=1
 extension.dir=${webcontainer.home}/domains/domain1/lib
 extension.dir.ri=${webcontainer.home.ri}/domains/domain1/lib
 
+#################################################################
+# To Configure config.vi with security manager
+#################################################################
+javaee.home=${webcontainer.home}
+###############################################################
+## Config params needed for Sun Java System Application Server
+## (SJSAS) asadmin. You must change these values as needed
+## only if you are testing against SJSAS app server
+## (javaee.home is pointing to SJSAS).
+#
+# @s1as.admin.user     -- The SJSAS asadmin user id
+# @s1as.admin.passwd   -- The SJSAS asadmin user password
+# @s1as.admin.host     -- The SJSAS host
+# @s1as.admin.port     -- The SJSAS port
+# @s1as.admin          -- The SJSAS admin command
+# @s1as.server         -- The SJSAS server instance being used
+# @s1as.domain.dir     -- Points to where your domains are installed.
+# @s1as.domain.name    -- The SJSAS domain being used
+# @s1as.domain         -- The SJSAS domain path being used
+# @s1as.asenv.loc      -- location of asenv.conf or asenv.bat
+# @s1as.imqbin.loc     -- location of the IMQ bin directory
+# @s1as.lib            -- Library directory for other Java EE RI
+#                         jars
+# @s1as.imq.share.lib  -- Shared library directory for imq 
+# @s1as.jvm.options    -- Java options needed by SJSAS
+#                         The xxxlogin and xxxpassword are used
+#                         to set known server side creds for use
+#                         with connector tests.
+# @s1as.java.endorsed.dirs -- endorsed directory used by SJSAS
+# @s1as.applicationRoot-- Location of application repository
+#                         Only needed when running on windows
+# @s1as.db.ext.dirs    -- The extension directory for DB Type 2
+#                         drivers.  Currently, this only needs
+#                         to be set when using DB2 else it
+#                         should be empty.
+############################################################### 
+s1as.admin=${javaee.home}/bin/asadmin
+s1as.domain.dir=${javaee.home}/domains
+s1as.domain.name=${glassfish.domain.name}
+s1as.domain=${s1as.domain.dir}/${s1as.domain.name}
+s1as.admin.host=${glassfish.admin.host}
+s1as.admin.port=${glassfish.admin.port}
+
 
 
diff --git a/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/AsyncHandler/Client.java b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/AsyncHandler/Client.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2021 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,25 +20,30 @@
 
 package com.sun.ts.tests.jaxws.api.jakarta_xml_ws.AsyncHandler;
 
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Properties;
+import com.sun.ts.lib.util.*;
+import com.sun.ts.lib.porting.*;
+import com.sun.ts.lib.harness.*;
+import com.sun.javatest.Status;
+import com.sun.ts.tests.jaxws.common.*;
 
-import javax.xml.namespace.QName;
-import javax.xml.transform.Source;
+import com.sun.ts.tests.jaxws.sharedclients.doclithelloclient.*;
 
-import com.sun.javatest.Status;
-import com.sun.ts.lib.harness.ServiceEETest;
-import com.sun.ts.lib.porting.TSURL;
-import com.sun.ts.lib.util.TestUtil;
-import com.sun.ts.tests.jaxws.common.JAXWS_Util;
+import java.io.*;
+import java.net.*;
+import java.util.*;
+import java.rmi.*;
+
+import jakarta.xml.ws.*;
+import jakarta.xml.ws.soap.*;
+import javax.xml.namespace.QName;
+import javax.naming.InitialContext;
 
 import jakarta.xml.bind.JAXBContext;
-import jakarta.xml.ws.Dispatch;
-import jakarta.xml.ws.WebServiceException;
+import jakarta.xml.bind.JAXBException;
+import javax.xml.transform.Source;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.sax.SAXSource;
+import javax.xml.transform.stream.StreamSource;
 
 public class Client extends ServiceEETest {
   // need to create jaxbContext

diff --git a/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/AsyncHandler/JAXBAsyncHandler.java b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/AsyncHandler/JAXBAsyncHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2021 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,8 +20,9 @@
 
 package com.sun.ts.tests.jaxws.api.jakarta_xml_ws.AsyncHandler;
 
-import com.sun.ts.lib.util.TestUtil;
+import com.sun.ts.tests.jaxws.sharedclients.doclithelloclient.*;
 
+import com.sun.ts.lib.util.*;
 import jakarta.xml.ws.AsyncHandler;
 import jakarta.xml.ws.Response;
 

diff --git a/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/AsyncHandler/XMLAsyncHandler.java b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/AsyncHandler/XMLAsyncHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2021 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,12 +20,11 @@
 
 package com.sun.ts.tests.jaxws.api.jakarta_xml_ws.AsyncHandler;
 
-import javax.xml.transform.Source;
-
-import com.sun.ts.lib.util.TestUtil;
+import com.sun.ts.lib.util.*;
 
 import jakarta.xml.ws.AsyncHandler;
 import jakarta.xml.ws.Response;
+import javax.xml.transform.Source;
 
 public class XMLAsyncHandler implements AsyncHandler<Source> {
   private boolean dataReady = false;

diff --git a/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/Binding/Client.java b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/Binding/Client.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2021 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,26 +20,26 @@
 
 package com.sun.ts.tests.jaxws.api.jakarta_xml_ws.Binding;
 
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
+import com.sun.ts.lib.util.*;
+import com.sun.ts.lib.porting.*;
+import com.sun.ts.lib.harness.*;
+import com.sun.ts.tests.jaxws.common.*;
+import com.sun.javatest.Status;
+
+import com.sun.ts.tests.jaxws.sharedclients.dlhandlerclient.*;
 
+import java.io.*;
+import java.net.*;
+import java.util.*;
+import java.rmi.*;
+
+import jakarta.xml.ws.*;
+import jakarta.xml.ws.soap.*;
 import javax.xml.namespace.QName;
+import jakarta.xml.ws.handler.*;
 import javax.xml.transform.Source;
 
-import com.sun.javatest.Status;
-import com.sun.ts.lib.harness.ServiceEETest;
-import com.sun.ts.lib.porting.TSURL;
-import com.sun.ts.lib.util.TestUtil;
-import com.sun.ts.tests.jaxws.common.JAXWS_Util;
-
-import jakarta.xml.ws.Binding;
-import jakarta.xml.ws.BindingProvider;
-import jakarta.xml.ws.Dispatch;
-import jakarta.xml.ws.WebServiceException;
-import jakarta.xml.ws.handler.Handler;
-import jakarta.xml.ws.soap.SOAPBinding;
+import javax.naming.InitialContext;
 
 public class Client extends ServiceEETest {
   // The webserver defaults (overidden by harness properties)

diff --git a/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/BindingProvider/Client.java b/src/com/sun/ts/tests/jaxws/api/jakarta_xml_ws/BindingProvider/Client.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2021 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,24 +20,29 @@
 
 package com.sun.ts.tests.jaxws.api.jakarta_xml_ws.BindingProvider;
 
-import java.net.URL;
-import java.util.Properties;
+import com.sun.ts.lib.util.*;
+import com.sun.ts.lib.porting.*;
+import com.sun.ts.lib.harness.*;
+import com.sun.ts.tests.jaxws.common.*;
+import com.sun.javatest.Status;
 
-import javax.xml.namespace.QName;
-import javax.xml.transform.Source;
+import com.sun.ts.tests.jaxws.sharedclients.doclithelloclient.*;
 
-import com.sun.javatest.Status;
-import com.sun.ts.lib.harness.ServiceEETest;
-import com.sun.ts.lib.porting.TSURL;
-import com.sun.ts.lib.util.TestUtil;
-import com.sun.ts.tests.jaxws.common.JAXWS_Util;
-import com.sun.ts.tests.jaxws.wsa.common.EprUtil;
-
-import jakarta.xml.ws.Binding;
-import jakarta.xml.ws.BindingProvider;
-import jakarta.xml.ws.Dispatch;
+import java.io.*;
+import java.net.*;
+import java.util.*;
+import java.rmi.*;
+
+import jakarta.xml.ws.*;
 import jakarta.xml.ws.EndpointReference;
 import jakarta.xml.ws.wsaddressing.W3CEndpointReference;
+import jakarta.xml.ws.soap.*;
+import javax.xml.namespace.QName;
+import jakarta.xml.ws.handler.*;
+import javax.xml.transform.Source;
+import com.sun.ts.tests.jaxws.wsa.common.*;
+
+import javax.naming.InitialContext;
 
 public class Client extends ServiceEETest {
   // The webserver defaults (overidden by harness properties)