Remove Authentication TCK and related contents (#1057)

* remove jaspic/authentication tck and related contents * fix commented syntax
jakartaee · Jun 20, 2022 · e691c8e · e691c8e
1 parent a1b06dd
commit e691c8e
Show file tree

Hide file tree

Showing 180 changed files with 19 additions and 45,574 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -17,7 +17,7 @@
 env.label = "jakartaee-tck-pod-${UUID.randomUUID().toString()}"
 
 default_suites=[ "samples", "signaturetest/javaee" ] 
-default_tcks=["caj", "connector", "el", "jacc", "jaspic", "jaxws", "jms", "jpa", "jsp", "jstl", "jta", "saaj", "servlet",  "websocket"]
+default_tcks=["caj", "connector", "el", "jacc", "jaxws", "jms", "jpa", "jsp", "jstl", "jta", "saaj", "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
@@ -188,9 +188,9 @@ spec:
            description: 'Database to be used for running CTS. Currently only JavaDB is supported.' )
     choice(name: 'BUILD_TYPE', choices: 'CTS\nSTANDALONE-TCK', 
            description: 'Run the full EE compliance testsuite or a standalone tck' )
-    string(name: 'test_suites', defaultValue: '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 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 jsonb jsonp jsp jstl jta jws samples servlet signaturetest/javaee webservices12 webservices13 websocket xa',
+    string(name: 'test_suites', defaultValue: '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 javaee javamail jaxrs 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 jsonb jsonp jsp jstl jta jws samples servlet signaturetest/javaee webservices12 webservices13 websocket xa',
            description: 'Space separated list of Test suites to run') 
-    string(name: 'standalone_tcks', defaultValue: 'caj connector el jacc jaspic jaxws jms jpa jsp jstl jta saaj servlet websocket', 
+    string(name: 'standalone_tcks', defaultValue: 'caj connector el jacc jaxws jms jpa jsp jstl jta saaj servlet websocket', 
            description: 'Space separated list of standalone TCKs to build and run') 
     string(name: 'USER_KEYWORDS',
            defaultValue: '',

diff --git a/docker/build_standalone-tcks.sh b/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=( websocket el connector jacc jaspic caj jms jsp jstl jaxws saaj servlet jpa jta )
+  TCK_LIST=( websocket el connector jacc caj jms jsp jstl jaxws saaj servlet jpa jta )
 else 
   TCK_LIST=( ${TCK_NAME} )
 fi
@@ -141,11 +141,6 @@ for tck in ${TCK_LIST[@]}; do
     TCK_SPECIFIC_PROPS="-Djacc.home=$GF_HOME/$GF_TOPLEVEL_DIR/glassfish/ -Djacc.classes=$JAKARTA_JARS/modules/jakarta.jms-api.jar:$JAKARTA_JARS/modules/jakarta.annotation-api.jar:$JAKARTA_JARS/modules/security.jar:$JAKARTA_JARS/modules/jakarta.servlet-api.jar:$JAKARTA_JARS/modules/jakarta.authorization-api.jar:$JAKARTA_JARS/modules/jakarta.ejb-api.jar:$JAKARTA_JARS/modules/jakarta.persistence-api.jar:$JAKARTA_JARS/modules/jakarta.interceptor-api.jar:$JAKARTA_JARS/modules/jakarta.mail-api.jar:$JAKARTA_JARS/modules/jakarta.transaction-api.jar:$JAKARTA_JARS/modules/jakarta.servlet.jsp-api.jar:$JAKARTA_JARS/modules/glassfish-corba-omgapi.jar:$JAKARTA_JARS/modules/glassfish-corba-omgapi.jar"
     DOC_SPECIFIC_PROPS=""
     JAXWS_SPECIFIC_PROPS=""
-  elif [ "jaspic" == "$tck" ]
-  then
-    TCK_SPECIFIC_PROPS="-Djaspic.home=$GF_HOME/$GF_TOPLEVEL_DIR/glassfish/"
-    DOC_SPECIFIC_PROPS=""
-    JAXWS_SPECIFIC_PROPS=""
   elif [ "caj" == "$tck" ]
   then
     TCK_SPECIFIC_PROPS="-Dlocal.classes=$JAKARTA_JARS/modules/jakarta.annotation-api.jar:$JAKARTA_JARS/modules/jakarta.transaction-api.jar:$JAKARTA_JARS/modules/glassfish-corba-omgapi.jar"

diff --git a/docker/jaspictck.sh b/docker/jaspictck.sh
diff --git a/install/jakartaee/bin/build.xml b/install/jakartaee/bin/build.xml
@@ -25,7 +25,6 @@
 	<property name="all.test.dir" value="
                   com/sun/ts/tests/jaxp,
                   com/sun/ts/tests/jacc,
-                  com/sun/ts/tests/jaspic,
                   com/sun/ts/tests/signaturetest/javaee,
                   com/sun/ts/tests/integration,
                   com/sun/ts/tests/el,
@@ -67,11 +66,11 @@
           cts development workspace.
 
       -->
-	<property name="temp.test.exclude.dirs" 
+	<!--property name="temp.test.exclude.dirs" 
  	      value="
              com/sun/ts/tests/jaspic/spi/authstatus,
              com/sun/ts/tests/jaspic/spi/soap"
-        />
+        /-->
 
 	<target name="generate.coverage.numbers">
 		<ant antfile="coverage-build.xml" dir="${bin.dir}" target="all" />
@@ -732,9 +731,9 @@
 	<property name="provider.dir" value = "com/sun/ts/tests/jacc/provider"/>
 	<property name="provider.jar.name" value = "tsprovider.jar"/>
 	<property name="provider.jar" value = "${ts.home}/lib/${provider.jar.name}"/>
-	<property name="jaspic.tssv.dir" value = "com/sun/ts/tests/jaspic/tssv"/>
+	<!--property name="jaspic.tssv.dir" value = "com/sun/ts/tests/jaspic/tssv"/>
 	<property name="jaspic.tssv.jar.name" value = "tssv.jar"/>
-	<property name="jaspic.tssv.jar" value = "${ts.home}/lib/${jaspic.tssv.jar.name}"/>
+	<property name="jaspic.tssv.jar" value = "${ts.home}/lib/${jaspic.tssv.jar.name}"/-->
 	<property name="dbprocedures.jar" value = "${ts.home}/lib/dbprocedures.jar"/>
 	<property name="install.lib.dir" value = "${ts.home}/install/jakartaee/lib"/>
 
@@ -780,26 +779,26 @@
 		<rmic classname="com.sun.ts.lib.implementation.sun.javaee.glassfish.AutoDeploymentServer" base="${class.dir}"/>
 	</target>
 
-	<target name="jaspic.lib.clean" depends="translatepath">
+	<!--target name="jaspic.lib.clean" depends="translatepath">
 		<delete failonerror="false">
 			<fileset dir="${class.dir}">
 				<include name="com/sun/ts/tests/jaspic"/>
 
 			</fileset>
 		</delete>
 		<delete failonerror="false" file="${jaspic.tssv.jar}"/>
-	</target>
+	</target-->
 
 
-	<target name="jaspic.lib.compile" depends="jaspic.lib.clean, bind.dtds">
+	<!--target name="jaspic.lib.compile" depends="jaspic.lib.clean, bind.dtds">
 		<ts.javac includes="${jaspic.tssv.dir}/config/**/*.java,
                             ${jaspic.tssv.dir}/module/**/*.java,
                             ${jaspic.tssv.dir}/util/**/*.java">
 			<classpath>
 				<pathelement path="${ts.lib.classpath}" />
 			</classpath>
 		</ts.javac>
-	</target>
+	</target-->
 
 
 	<target name="tslib" depends="tslib.compile">
@@ -820,7 +819,7 @@
 		</jar>
 
 		<antcall target="build.tsprovider.jar"/>
-		<antcall target="build.jaspic.jars"/>
+		<!--antcall target="build.jaspic.jars"/-->
 
 		<ant antfile="javaee_vi.xml" dir="${bin.dir}/xml/impl/${impl.vi}" target="build.porting.impl.jar"/>
 
@@ -832,9 +831,9 @@
 	</target>
 
 	<!-- build jaspic jars -->
-	<target name="build.jaspic.jars">
+	<!--target name="build.jaspic.jars">
 		<antcall target="build.tssv.jar"/>
-	</target>
+	</target-->
 
 
 	<!-- build jacc tsprovider jar -->
@@ -861,8 +860,9 @@
 
 
 	<!-- build jaspics tssv.jar -->
-	<target name="build.tssv.jar">
-		<!-- build the JASPIC (JSR-196) provider jar file -->
+	<!-- build the JASPIC (JSR-196) provider jar file -->
+
+	<!--target name="build.tssv.jar">
 		<delete failonerror="true" file="${jaspic.tssv.jar}"/>
 		<antcall target="jaspic.lib.compile"/>
 		<jar jarfile="${jaspic.tssv.jar}"
@@ -880,7 +880,7 @@
 		</jar>
 
 		<antcall target="update.tssv.jar"/>
-	</target>
+	</target-->
 
 
 

diff --git a/install/jakartaee/other/vehicle.properties b/install/jakartaee/other/vehicle.properties
@@ -79,8 +79,6 @@ com/sun/ts/tests/connector/xa/workmgt = ejb servlet jsp
 
 com/sun/ts/tests/el = servlet jsp
 
-com/sun/ts/tests/jaspic/spi/baseline = jaspicservlet
-
 com/sun/ts/tests/javamail = appclient ejb servlet jsp
 
 com/sun/ts/tests/samples/javamail = ejb servlet jsp