remove migrated jaxrs tests, docs and related contents, fixed conflicts

Signed-off-by: alwin-joseph <alwin.joseph@oracle.com>

Jenkinsfile

@@ -17,7 +17,7 @@
 env.label = "jakartaee-tck-pod-${UUID.randomUUID().toString()}"
 
 default_suites=[ "samples", "signaturetest/javaee" ] 
-default_tcks=["caj", "concurrency", "connector", "el", "jacc", "jaspic", "jaxrs", "jaxws", "jms", "jpa", "jsf", "jsp", "jsonb", "jsonp", "jstl", "jta", "saaj", "securityapi", "servlet",  "websocket"]
+default_tcks=["caj", "concurrency", "connector", "el", "jacc", "jaspic", "jaxws", "jms", "jpa", "jsf", "jsp", "jsonb", "jsonp", "jstl", "jta", "saaj", "securityapi", "servlet",  "websocket"]
 
 def cts_suites = params.test_suites != null ? params.test_suites.split() : default_suites
 def tcks = params.standalone_tcks != null ? params.standalone_tcks.split() : default_tcks
@@ -192,7 +192,7 @@ spec:
            description: 'Run the full EE compliance testsuite or a standalone tck' )
     string(name: 'test_suites', defaultValue: 'concurrency connector ejb ejb30/bb ejb30/lite/appexception ejb30/lite/async ejb30/lite/basic ejb30/lite/ejbcontext ejb30/lite/enventry ejb30/lite/interceptor ejb30/lite/lookup ejb30/lite/naming ejb30/lite/nointerface  ejb30/lite/packaging ejb30/lite/singleton ejb30/lite/stateful ejb30/lite/tx ejb30/lite/view ejb30/lite/xmloverride ejb30/assembly ejb30/timer ejb30/webservice ejb30/zombie ejb30/misc ejb30/sec ejb32 el integration jacc jaspic javaee javamail jaxrs jbatch jdbc_appclient jdbc_ejb jdbc_jsp jdbc_servlet jms_appclient jms_ejb jms_jsp jms_servlet jpa_appmanaged jpa_appmanagedNoTx jpa_pmservlet jpa_puservlet jpa_stateful3 jpa_stateless3 jsf jsonb jsonp jsp jstl jta jws samples securityapi servlet signaturetest/javaee webservices12 webservices13 websocket xa',
            description: 'Space separated list of Test suites to run') 
-    string(name: 'standalone_tcks', defaultValue: 'caj concurrency connector el jacc jaspic jaxrs jaxws jms jpa jsf jsp jsonb jsonp jstl jta saaj securityapi servlet websocket', 
+    string(name: 'standalone_tcks', defaultValue: 'caj concurrency connector el jacc jaspic jaxws jms jpa jsf jsp jsonb jsonp jstl jta saaj securityapi servlet websocket', 
            description: 'Space separated list of standalone TCKs to build and run') 
     string(name: 'USER_KEYWORDS',
            defaultValue: '',

bin/coverage-build.xml

@@ -406,16 +406,6 @@
     </antcall>
   </target>
 
-  <target name="jaxrs">
-    <antcall target="calculate.coverage">
-      <param name="api.coverage.dir"  value="${coverage.base.dir}/jaxrs_2_1/api"/>
-      <param name="spec.coverage.dir" value="${coverage.base.dir}/jaxrs_2_1/spec"/>
-      <param name="api.assertions"    value="${ts.docs.dir}/jaxrs/JAXRSJavadocAssertions.xml"/>
-      <param name="spec.assertions"   value="${ts.docs.dir}/jaxrs/JAXRSSpecAssertions.xml"/>
-      <param name="test.src.dir"      value="/jaxrs"/>
-    </antcall>
-  </target>
-
   <target name="jaxws">
     <antcall target="calculate.coverage">
       <param name="api.coverage.dir"  value="${coverage.base.dir}/jaxws_2_2/api"/>

docker/build_standalone-tcks.sh

@@ -68,7 +68,7 @@ fi
 echo "The option selected to build is $TCK_NAME TCK"
 
 if [ "All" == "$TCK_NAME" ];then
-  TCK_LIST=( jsonp jsonb jaxrs websocket el concurrency connector jacc jaspic caj jms jsp jstl jaxws saaj servlet jsf securityapi jpa jta )
+  TCK_LIST=( jsonp jsonb websocket el concurrency connector jacc jaspic caj jms jsp jstl jaxws saaj servlet jsf securityapi jpa jta )
 else 
   TCK_LIST=( ${TCK_NAME} )
 fi
@@ -136,16 +136,6 @@ for tck in ${TCK_LIST[@]}; do
     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 "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 "s#impl\.vi=.*#impl.vi=glassfish#g" $BASEDIR/install/$tck/bin/ts.jte
-    sed -i "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 "s#jaxrs_impl_name=.*#jaxrs_impl_name=jersey#g" $BASEDIR/install/$tck/bin/ts.jte
-    sed -i '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"
@@ -230,10 +220,6 @@ for tck in ${TCK_LIST[@]}; do
 
   ant -f $BASEDIR/install/$tck/bin/build.xml -Ddeliverabledir=$tck -Dbasedir=$BASEDIR/install/$tck/bin $RMI_CLASSES $TCK_SPECIFIC_PROPS $JAXWS_SPECIFIC_PROPS build.all 
 
-  if [ "jaxrs" == "$tck" ]; then
-    ant -f $BASEDIR/install/$tck/bin/build.xml -Ddeliverabledir=$tck -Dbasedir=$BASEDIR/install/$tck/bin $RMI_CLASSES $TCK_SPECIFIC_PROPS update.jaxrs.wars
-  fi
-
   mkdir -p $BASEDIR/internal/docs/$tck
   cp $BASEDIR/internal/docs/dtd/*.dtd $BASEDIR/internal/docs/$tck/
   if [[ "$LICENSE" == "EFTL" || "$LICENSE" == "eftl" ]]; then

docker/jaxrstck/README

@@ -1,8 +1,10 @@
 The pom.xml in this folder can be used to run the Jakarta REST Standalone TCK 
-against Glassfish 6.1.0+ (with Java SE 11+ compatability)
+against Glassfish 6.1.0+ (with Java SE 11+ compatability) 
+also using https://github.com/jakartaee/rest/tree/master/jersey-tck
+
 
 Below are the instructions to run the Jakarta REST TCK that is built from 
-https://github.com/eclipse-ee4j/jaxrs-api repository.
+https://github.com/jakartaee/rest repository.
 
 1. Install Java11+ , set JAVAHOME
 2. Install Maven 3.6+ set M2_HOME
@@ -12,8 +14,15 @@ eg: export PATH=$ANT_HOME/bin:$M2_HOME/bin:$JAVA_HOME/bin:<path to current direc
 
 4. Download the latest Eclipse Jakarta REST TCK zip bundle that contains the tck jar.
 (If the jar is available from maven this step is not required as it will be resolved when dependencies are downloaded)
-4a. Unzip the jakarta.ws.rs-tck-3.1.0.zip to extract the tck jar jakarta.ws.rs-tck-3.1.0.jar
-4b. Install the tck jar jakarta.ws.rs-tck-3.1.0.jar using below mvn install command:
-mvn install:install-file -DcreateChecksum=true -Dpackaging=jar -Dfile=$WORKSPACE/jakarta.ws.rs-tck-3.1.0.jar -DgroupId=jakarta.ws.rs -DartifactId=jakarta.ws.rs-tck -Dversion=3.1.0
+4a. Unzip the jakarta-restful-ws-tck-3.1.0.zip to extract the tck jar jakarta-restful-ws-tck-3.1.0.jar
+4b. Install the tck jar jakarta-restful-ws-tck-3.1.0.jar using below mvn install command:
+mvn install:install-file -DcreateChecksum=true -Dpackaging=jar -Dfile=$WORKSPACE/jakarta-restful-ws-tck-3.1.0.jar -DgroupId=jakarta.ws.rs -DartifactId=jakarta-restful-ws-tck -Dversion=3.1.0
+
+5. Clone the rest repo to use rest/jersey-tck/ folder with necessary files to run the REST TCK.
+-git clone https://github.com/jakartaee/rest 
+
+Replace the pom.xml in rest/jersey-tck/ directory with the pom.xml in this folder.
+-Copy https://github.com/eclipse-ee4j/jakartaee-tck/blob/master/docker/jaxrstck/pom.xml 
+-cp pom.xml rest/jersey-tck/ 
 
-5. mvn clean verify
+6. cd rest/jersey-tck ; mvn clean verify