Revert unintended changes, incorrect merges

Signed-off-by: Scott M Stark <starksm64@gmail.com>

docker/build_standalone-tcks.sh

@@ -121,31 +121,6 @@ for tck in ${TCK_LIST[@]}; do
     TCK_SPECIFIC_PROPS="-Djta.classes=$JAKARTA_JARS/modules/jakarta.transaction-api.jar:$JAKARTA_JARS/modules/jakarta.servlet-api.jar:$JAKARTA_JARS/modules/glassfish-corba-omgapi.jar"
     DOC_SPECIFIC_PROPS=""
     JAXWS_SPECIFIC_PROPS=""
-  elif [ "jsf" == "$tck" ]
-  then
-    TCK_SPECIFIC_PROPS="-Djsf.classes=$JAKARTA_JARS/modules/jakarta.enterprise.cdi-api.jar:$JAKARTA_JARS/modules/jakarta.servlet.jsp.jstl-api.jar:$JAKARTA_JARS/modules/jakarta.inject-api.jar:$JAKARTA_JARS/modules/jakarta.faces-api.jar:$JAKARTA_JARS/modules/jakarta.servlet.jsp-api.jar:$JAKARTA_JARS/modules/jakarta.servlet-api.jar:$JAKARTA_JARS/modules/jakarta.el-api.jar:$JAKARTA_JARS/modules/jakarta.annotation-api.jar:$JAKARTA_JARS/modules/glassfish-corba-omgapi.jar"
-    DOC_SPECIFIC_PROPS=""
-    JAXWS_SPECIFIC_PROPS=""
-  elif [ "jsonp" == "$tck" ]
-  then
-    TCK_SPECIFIC_PROPS="-Djsonp.classes=$JAKARTA_JARS/modules/jakarta.json-api.jar:$JAKARTA_JARS/modules/jakarta.json.bind-api.jar:$JAKARTA_JARS/modules/glassfish-corba-omgapi.jar"
-    DOC_SPECIFIC_PROPS=""
-    JAXWS_SPECIFIC_PROPS=""
-  elif [ "jsonb" == "$tck" ]
-  then
-    TCK_SPECIFIC_PROPS="-Djsonb.classes=$JAKARTA_JARS/modules/jakarta.json-api.jar:$JAKARTA_JARS/modules/jakarta.json.bind-api.jar:$JAKARTA_JARS/modules/jakarta.inject-api.jar:$JAKARTA_JARS/modules/jakarta.servlet-api.jar:$JAKARTA_JARS/modules/glassfish-corba-omgapi.jar"
-    DOC_SPECIFIC_PROPS=""
-    JAXWS_SPECIFIC_PROPS=""
-  elif [ "jaxrs" == "$tck" ]
-  then
-    TCK_SPECIFIC_PROPS="-Djaxrs.classes=$JAKARTA_JARS/modules/jakarta.json-api.jar:$JAKARTA_JARS/modules/jakarta.json.bind-api.jar:$JAKARTA_JARS/modules/jsonp-jaxrs.jar:$JAKARTA_JARS/modules/jakarta.ws.rs-api.jar:$JAKARTA_JARS/modules/jsonp-jaxrs.jar:$JAKARTA_JARS/modules/jakarta.annotation-api.jar:$JAKARTA_JARS/modules/jakarta.ejb-api.jar:$JAKARTA_JARS/modules/jakarta.interceptor-api.jar:$JAKARTA_JARS/modules/jakarta.servlet-api.jar:$JAKARTA_JARS/modules/jakarta.enterprise.cdi-api.jar:$JAKARTA_JARS/modules/jakarta.inject-api.jar:$JAKARTA_JARS/modules/jakarta.validation-api.jar:$JAKARTA_JARS/modules/jakarta.xml.bind-api.jar:$JAKARTA_JARS/modules/jakarta.activation-api.jar:$JAKARTA_JARS/modules/webservices-api.jar:$JAKARTA_JARS/modules/glassfish-corba-omgapi.jar"
-    sed -i.bak "s#impl\.vi\.deploy\.dir=.*#impl.vi.deploy.dir=$GF_HOME/$GF_TOPLEVEL_DIR/glassfish/domains/domain1/autodeploy#g" $BASEDIR/install/$tck/bin/ts.jte
-    sed -i.bak "s#impl\.vi=.*#impl.vi=glassfish#g" $BASEDIR/install/$tck/bin/ts.jte
-    sed -i.bak "s#jaxrs_impl_lib=.*#jaxrs_impl_lib=$GF_HOME/$GF_TOPLEVEL_DIR/glassfish/modules/jersey-container-servlet-core.jar#g" $BASEDIR/install/$tck/bin/ts.jte
-    sed -i.bak "s#jaxrs_impl_name=.*#jaxrs_impl_name=jersey#g" $BASEDIR/install/$tck/bin/ts.jte
-    sed -i.bak 's#servlet_adaptor=.*#servlet_adaptor=org\/glassfish\/jersey\/servlet\/ServletContainer.class#g' $BASEDIR/install/$tck/bin/ts.jte
-    DOC_SPECIFIC_PROPS=""
-    JAXWS_SPECIFIC_PROPS=""
   elif [ "websocket" == "$tck" ]
   then
     TCK_SPECIFIC_PROPS="-Dwebsocket.classes=$JAKARTA_JARS/modules/jakarta.websocket-client-api.jar:$JAKARTA_JARS/modules/jakarta.websocket-api.jar:$JAKARTA_JARS/modules/jakarta.servlet-api.jar:$JAKARTA_JARS/modules/jakarta.inject-api.jar:$JAKARTA_JARS/modules/jakarta.enterprise.cdi-api.jar:$JAKARTA_JARS/modules/jakarta.activation-api.jar:$JAKARTA_JARS/modules/glassfish-corba-omgapi.jar:$JAKARTA_JARS/modules/jakarta.xml.bind-api.jar"

install/jakartaee/bin/ts.jte

@@ -83,8 +83,8 @@ jte.version=@JTE_VERSION@
 #                    if.existing.work.report.dirs = value in this file
 #                  end if
 ######################################################################## 
-work.dir=/Users/starksm/Dev/JBoss/Jakarta/rh-jakartaee-tck/JTWork
-report.dir=/Users/starksm/Dev/JBoss/Jakarta/rh-jakartaee-tck/JTReport
+work.dir=/files/JTWork
+report.dir=/files/JTReport
 if.existing.work.report.dirs=auto
 
 ########################################################################
@@ -198,7 +198,7 @@ javaee.level=full
 #              to for service requests.
 ########################################################################
 javaee.home=
-orb.host=
+orb.host=localhost
 orb.port=3699
 
 ########################################################################
@@ -215,7 +215,7 @@ orb.port=3699
 #                 requests.
 ########################################################################
 javaee.home.ri=
-orb.host.ri=
+orb.host.ri=localhost
 orb.port.ri=3700
 
 ###################################################################
@@ -1945,7 +1945,7 @@ platform.mode=jakartaEE
 # tools.jar should be set to the location of the tools.jar from the installed
 # jdk
 ###########################################################################
-tools.jar=/Users/starksm/Dev/JBoss/Jakarta/rh-jakartaee-tck/modules/webservices-tools.jar:/Users/starksm/Dev/JBoss/Jakarta/rh-jakartaee-tck/modules/webservices-api.jar
+tools.jar=${jdk.home}/lib/tools.jar
 
 ###########################################################################
 # various flags used by the generation tools
@@ -1958,7 +1958,7 @@ wsimport.ant.classname=
 wsimport.classpath=${javaee.classes}${pathsep}${tools.jar}
 wsimport.verbose=true
 wsimport.debug=false
-wsimport.jvmargs=
+wsimport.jvmargs=-Djavax.xml.accessExternalSchema=all
 
 ###########################################################################
 # various flags used by Suns generation tools
@@ -1972,7 +1972,7 @@ ri.wsimport.ant.classname=com.sun.tools.ws.ant.WsImport
 ri.wsimport.classpath=${javaee.classes.ri}${pathsep}${tools.jar}
 ri.wsimport.verbose=true
 ri.wsimport.debug=false
-ri.wsimport.jvmargs=
+ri.wsimport.jvmargs=-Djavax.xml.accessExternalSchema=all
 
 #################################
 ## Packaging properties for DAOs
@@ -2388,10 +2388,10 @@ ws_wait=5
 #
 ############################################################################################
 
-mailHost=
-mailuser1=
-mailFrom=
-javamail.password=
+mailHost=jsepc04.us.oracle.com
+mailuser1=cts1@jsepc04.us.oracle.com
+mailFrom=cts1@jsepc04.us.oracle.com
+javamail.password=cts1
 smtp.port=25
 imap.port=143
 

src/com/sun/ts/tests/appclient/deploy/metadatacomplete/testapp/HelloService.wsdl

@@ -1,5 +1,23 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!-- Generated by JAX-WS RI (https://github.com/eclipse-ee4j/metro-jax-ws). RI's version is Eclipse Metro/4.0.0-M4 (RELEASE-4.0.0-M4-3da3fb9; 2022-03-31T12:28:52+0000) XMLWS-Impl/4.0.0-M4 XMLWS-API/4.0.0 XMLB-Impl/4.0.0-M4 XMLB-API/4.0.0 git-revision#3da3fb9. -->
+<!--
+
+    Copyright (c) 2018 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
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+
+<!-- Generated by JAX-WS RI (http://jax-ws.java.net). RI's version is Metro/2.3.2-b608 (trunk-7979; 2015-01-21T12:50:19+0000) JAXWS-RI/2.2.11-b150120.1832 JAXWS-API/2.2.12 JAXB-RI/2.2.12-b141219.1637 JAXB-API/2.2.13-b141020.1521 svn-revision#unknown. -->
 <definitions targetNamespace="http://testapp.metadatacomplete.deploy.appclient.tests.ts.sun.com/" name="HelloService" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:wsp="http://www.w3.org/ns/ws-policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:wsp1_2="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:tns="http://testapp.metadatacomplete.deploy.appclient.tests.ts.sun.com/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata">
   <types>
     <xsd:schema>

src/com/sun/ts/tests/appclient/deploy/metadatacomplete/testapp/HelloService_schema1.xsd

@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+
+    Copyright (c) 2018 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
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+
 <xs:schema version="1.0" targetNamespace="http://testapp.metadatacomplete.deploy.appclient.tests.ts.sun.com/" xmlns:tns="http://testapp.metadatacomplete.deploy.appclient.tests.ts.sun.com/" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
   <xs:element name="sayHello" type="tns:sayHello"/>