[548] Remove RMI-IIOP tests

Signed-off-by: Scott Marlow <smarlow@redhat.com>
scottmarlow · Oct 21, 2020 · bbe0a4f · bbe0a4f
1 parent b6ab9e0
commit bbe0a4f
Show file tree

Hide file tree

Showing 124 changed files with 12 additions and 19,706 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -190,7 +190,7 @@ 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: '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 rmiiiop samples securityapi servlet signaturetest/javaee webservices12 webservices13 websocket xa',
+    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', 
            description: 'Space separated list of standalone TCKs to build and run') 

diff --git a/bin/coverage-build.xml b/bin/coverage-build.xml
@@ -77,7 +77,7 @@
   <property name="spec.stylesheet"           value="${ts.tools.home}/docs/xsl/assertions/spec_assertions.xsl"/>
   <property name="api.html.assertion.file"   value="api-assertions.html"/>
   <property name="spec.html.assertion.file"  value="spec-assertions.html"/>
-  <property name="srcdirs"  value="appclient,ejb,integration,jacc,jsf,jstl,rmiiiop,assembly,
+  <property name="srcdirs"  value="appclient,ejb,integration,jacc,jsf,jstl,assembly,
                               ejb30,internal,jaspic,jdbc,jsonb,jta,saaj,concurrency,ejb32,
                               javaee,jaxrs,jms,jsonp,jws,samples,common,connector,el,javamail,servlet,
                               webservices13,websocket,xa,jaxws,jpa,jsp,securityapi,webservices12"/>
@@ -314,7 +314,7 @@
 	                              jta,jdbc,ejb,connector,jaspic,
 	                              jsp,el,servlet,jms,jacc,javaee,jstl,jpa,
 	                              jaxrs,webservices,jsf,jsonp,
-                                  jsonb,concurrency,websocket,rmiiiop,securityapi">
+                                  jsonb,concurrency,websocket,securityapi">
     <antcall target="generate.exec.summary"/>
     <antcall target="generate.index.page"/>
     <antcall target="set.permissions"/>
@@ -562,14 +562,6 @@
     </for>
   </target>
 
-  <target name="rmiiiop">
-    <antcall target="calculate.coverage">
-  	  <param name="spec.coverage.dir" value="${coverage.base.dir}/rmiiiop_2_3_1/spec"/>
-  	  <param name="spec.assertions"   value="${ts.docs.dir}/rmiiiop/RMIIIOPSpecAssertions.xml"/>
-  	  <param name="test.src.dir"      value="/rmiiiop"/>
-	</antcall>
-  </target>
-
   <target name="jsf">
     <antcall target="calculate.coverage">
       <param name="api.coverage.dir"  value="${coverage.base.dir}/jsf_2_3/api"/>

diff --git a/bin/xml/impl/glassfish/s1as.xml b/bin/xml/impl/glassfish/s1as.xml
@@ -1183,7 +1183,7 @@
                                        samples, webservices12, assembly, ejb, jacc,
                                        jdbc, jta, servlet, ejb30, javamail, jms,
                                        jws, signaturetest, xa, integration,
-                                       jsf, rmiiiop, 
+                                       jsf, 
                                        jsp, saaj"/>
 
     <!-- timeout is specified in seconds, default is 3 minutes -->

diff --git a/bin/xml/ts.top.import.xml b/bin/xml/ts.top.import.xml
@@ -784,8 +784,6 @@
             <sysproperty key="ORB_PORT" value="${orb.port}" />
             <sysproperty key="ORB_HOST_RI" value="${orb.host.ri}" />
             <sysproperty key="ORB_PORT_RI" value="${orb.port.ri}" />
-            <sysproperty key="rmiiiop.http.server.host" value="${rmiiiop.http.server.host}" />
-            <sysproperty key="rmiiiop.http.server.port" value="${rmiiiop.http.server.port}" />
             <sysproperty key="com.sun.enterprise.home" value="${javaee.home.ri}"/>
             <sysproperty key="com.sun.aas.installRoot" value="${javaee.home.ri}"/>
             <sysproperty key="com.sun.aas.configRoot" value="${javaee.home}/config"/>

diff --git a/install/j2eemgmt/bin/build.properties b/install/j2eemgmt/bin/build.properties
@@ -27,11 +27,6 @@ orb.port.ri=1050
 local.classes.ri=${j2ee.home.ri}/lib/cloudscape/RmiJdbc.jar:${j2ee.home.ri}/lib/cloudscape/cloudclient.jar
 java.endorsed.dirs=${j2ee.home.ri}/lib/endorsed
 
-# Settings for RMIIIOP EE STANDALONE Tests that use the standalone 
-# RMIIIOPServer.
-rmiiiop.http.server.host=localhost
-rmiiiop.http.server.port=10000
-
 # Set your local timezone. For valid values, consult your Operating System 
 # documentation.
 tz=US/Eastern

diff --git a/install/j2eemgmt/bin/build.xml b/install/j2eemgmt/bin/build.xml
@@ -25,7 +25,7 @@
     <target name="build.all" depends="build.all.jars,build.all.tests"/>
 
     <target name="build.all.tests" >
-      <property name="all.test.dir" value="signaturetest, interop, integration, ejb, common, jdbc, connector, jms, xa, servlet, jsp, appclient, javamail, rmiiiop, assembly, jta, samples"/>
+      <property name="all.test.dir" value="signaturetest, interop, integration, ejb, common, jdbc, connector, jms, xa, servlet, jsp, appclient, javamail, assembly, jta, samples"/>
       <elementappend original="${all.test.dir}" prefix="com/sun/ts/tests" suffix="**/*.java" property="all.java.file"/>
 
       <echo message="Compiling:${all.java.file}"/>
@@ -183,8 +183,6 @@
 		<sysproperty key="LOCAL_CLASSES_RI" value="${local.classes.ri}" />
         <sysproperty key="ORB_HOST_RI" value="${orb.host.ri}" />
         <sysproperty key="ORB_PORT_RI" value="${orb.port.ri}" />
-		<sysproperty key="rmiiiop.http.server.host" value="${rmiiiop.http.server.host}" />
-		<sysproperty key="rmiiiop.http.server.port" value="${rmiiiop.http.server.port}" />
 		<sysproperty key="TZ" value="${tz}" />
 		<sysproperty key="deliverable.class" value="${deliverable.class}" />
 		<sysproperty key="java.endorsed.dirs" value="${java.endorsed.dirs}" />
@@ -226,8 +224,6 @@
 		<sysproperty key="LOCAL_CLASSES_RI" value="${local.classes.ri}" />
         <sysproperty key="ORB_HOST_RI" value="${orb.host.ri}" />
         <sysproperty key="ORB_PORT_RI" value="${orb.port.ri}" />
-		<sysproperty key="rmiiiop_http_server_host" value="${rmiiiop.http.server.host}" />
-		<sysproperty key="rmiiiop_http_server_port" value="${rmiiiop.http.server.port}" />
 		<sysproperty key="TZ" value="${tz}" />
 		<sysproperty key="deliverable.class" value="${deliverable.class}" />
         <sysproperty key="java.endorsed.dirs" value="${java.endorsed.dirs}" />
@@ -279,22 +275,6 @@
     </java>
   </target>
 
-  <target name="start.rmiiiop.server">
-    <java classname="com.sun.ts.tests.rmiiiop.ee.standalone.RMIIIOPServer" fork="yes" failonerror="yes" 
-      classpath="${ts.classpath}:${class.dir}">
-      <sysproperty key="java.security.policy"
-                   value="${bin.dir}/java.policy"/>
-      <sysproperty key="org.omg.CORBA.ORBClass" 
-                   value="com.sun.corba.se.internal.POA.POAORB"/>
-      <sysproperty key="org.omg.CORBA.ORBSingletonClass"
-                   value="com.sun.corba.se.internal.corba.ORBSingleton"/>
-      <sysproperty key="javax.rmi.CORBA.UtilClass"
-                   value="com.sun.corba.se.internal.POA.ShutdownUtilDelegate"/>
-      <arg line="-v"/>
-      <arg line="-p ${rmiiiop.http.server.port}"/>
-    </java>
-  </target>
-
   <target name="init" depends="get.harness.debug, default.harness.debug"/>
 
   <target name="get.harness.debug" if="env.HARNESS_DEBUG">

diff --git a/install/j2eemgmt/bin/ts.jte b/install/j2eemgmt/bin/ts.jte
@@ -395,15 +395,6 @@ transport_protocol=smtp
 mailFrom=
 mailHost=
 
-#######################################################################
-#These properties are needed for the RMIIIOP EE STANDALONE tests which
-#use the standalone RMIIIOPServer. RMIIIOP_HTTP_SERVER_HOST is the host
-#where the standalone RMIIIOPServer is running. RMIIIOP_HTTP_SERVER_PORT
-#is the HTTP port that the standalone RMIIIOPServer is listening on.
-########################################################################
-rmiiiopHttpServerHost=${rmiiiop.http.server.host}
-rmiiiopHttpServerPort=${rmiiiop.http.server.port}
-
 ###############################################################
 #These properties are needed for signaturetest.
 ###############################################################

diff --git a/install/jakartaee/bin/build.xml b/install/jakartaee/bin/build.xml
@@ -44,7 +44,6 @@
                   com/sun/ts/tests/jstl,
                   com/sun/ts/tests/appclient,
                   com/sun/ts/tests/javamail,
-                  com/sun/ts/tests/rmiiiop,
                   com/sun/ts/tests/assembly,
                   com/sun/ts/tests/jta,
                   com/sun/ts/tests/samples,
@@ -123,14 +122,8 @@
                        property="temp.test.exclude.java.files"/>
 -->
 
-		<property name="rmiiiop.stub.dir" 
-                  value="org/omg/stub/com/sun/ts/tests/rmiiiop" />
-		<elementappend original="${rmiiiop.stub.dir}" suffix="**/*.java" property="rmiiiop.stub.java.file"/>
-
 		<echo message="Test Dirs:${all.test.dir}"/>
 
-		<ts.javac includes="${rmiiiop.stub.java.file}" failonerror="false"/>
-
 		<dosubdirs srcdir="${ts.home}/src" includes="${all.test.dir}" todo="build"
                    excludes="com/sun/ts/tests/jpa/se, com/sun/ts/tests/jpa/jpa22/se,
                              ${temp.test.exclude.dirs}"/>
@@ -167,26 +160,6 @@
 		<javatest.gui/>
 	</target>
 
-	<target name="start.rmiiiop.server">
-		<java classname="com.sun.ts.tests.rmiiiop.ee.standalone.RMIIIOPServer" fork="yes" failonerror="yes" 
-              classpath="${ts.run.classpath}:${class.dir}">
-			<sysproperty key="java.security.policy"
-                         value="${bin.dir}/java.policy"/>
-			<arg line="-v"/>
-			<arg line="-p ${rmiiiop.http.server.port}"/>
-		</java>
-	</target>
-
-	<target name="start.rmiiiop.server.no.spawn">
-		<java classname="com.sun.ts.tests.rmiiiop.ee.standalone.RMIIIOPServer" failonerror="yes" 
-              classpath="${ts.run.classpath}:${class.dir}">
-			<sysproperty key="java.security.policy"
-                         value="${bin.dir}/java.policy"/>
-			<arg line="-v"/>
-			<arg line="-p ${rmiiiop.http.server.port}"/>
-		</java>
-	</target>
-
 	<target name="start.auto.deployment.server" depends="init">
 		<java classname="com.sun.ts.lib.implementation.sun.javaee.glassfish.AutoDeploymentServer"
               fork="yes"

diff --git a/install/jakartaee/bin/ts.jte b/install/jakartaee/bin/ts.jte
@@ -497,16 +497,6 @@ extension.dir=${s1as.domain}/lib/ext
 ###############################################################
 instance.listenerName=orb-listener-1
 
-###############################################################
-## Settings for RMIIIOP EE STANDALONE Tests that use the
-## standalone RMIIIOPServer.
-#
-# @rmiiiop.http.server.host - RMI server hostname
-# @rmiiiop.http.server.port - RMI server port
-###############################################################
-rmiiiop.http.server.host=${orb.host}
-rmiiiop.http.server.port=10000
-
 ###############################################################
 # @tz - your local timezone. For valid values, consult your
 #       Operating System documentation.
@@ -1933,15 +1923,6 @@ jstl.db.password=${password1}
 command.testExecuteSameJVM=com.sun.ts.lib.harness.ExecuteTSTestSameJVMCmd \
         $testExecuteClass $testExecuteArgs
 
-#######################################################################
-## These properties are needed for the RMIIIOP EE STANDALONE tests which
-## use the standalone RMIIIOPServer. RMIIIOP_HTTP_SERVER_HOST is the host
-## where the standalone RMIIIOPServer is running. RMIIIOP_HTTP_SERVER_PORT
-## is the HTTP port that the standalone RMIIIOPServer is listening on.
-########################################################################
-rmiiiopHttpServerHost=${rmiiiop.http.server.host}
-rmiiiopHttpServerPort=${rmiiiop.http.server.port}
-
 ###############################################################
 ## These properties are used for the JDBC specific tests,
 ## they do not need to be changed.

diff --git a/install/jakartaee/bin/ts.jte.jdk9 b/install/jakartaee/bin/ts.jte.jdk9
@@ -505,16 +505,6 @@ extension.dir=${s1as.domain}/lib/ext
 ###############################################################
 instance.listenerName=orb-listener-1
 
-###############################################################
-## Settings for RMIIIOP EE STANDALONE Tests that use the
-## standalone RMIIIOPServer.
-#
-# @rmiiiop.http.server.host - RMI server hostname
-# @rmiiiop.http.server.port - RMI server port
-###############################################################
-rmiiiop.http.server.host=${orb.host}
-rmiiiop.http.server.port=10000
-
 ###############################################################
 # @tz - your local timezone. For valid values, consult your
 #       Operating System documentation.
@@ -2039,15 +2029,6 @@ jstl.db.password=${password1}
 command.testExecuteSameJVM=com.sun.ts.lib.harness.ExecuteTSTestSameJVMCmd \
         $testExecuteClass $testExecuteArgs
 
-#######################################################################
-## These properties are needed for the RMIIIOP EE STANDALONE tests which
-## use the standalone RMIIIOPServer. RMIIIOP_HTTP_SERVER_HOST is the host
-## where the standalone RMIIIOPServer is running. RMIIIOP_HTTP_SERVER_PORT
-## is the HTTP port that the standalone RMIIIOPServer is listening on.
-########################################################################
-rmiiiopHttpServerHost=${rmiiiop.http.server.host}
-rmiiiopHttpServerPort=${rmiiiop.http.server.port}
-
 ###############################################################
 ## These properties are used for the JDBC specific tests,
 ## they do not need to be changed.

diff --git a/install/jakartaee/other/vehicle.properties b/install/jakartaee/other/vehicle.properties
@@ -163,9 +163,6 @@ com/sun/ts/tests/ejb32/lite/timer/schedule/lifecycle = ejbliteservlet ejbliteser
 com/sun/ts/tests/ejb32/lite/timer/schedule/txnonpersistent = ejbliteservlet ejbliteservlet2 ejblitejsf ejblitejsp
 com/sun/ts/tests/ejb32/timer = ejbliteservlet
 
-com/sun/ts/tests/rmiiiop/ee/marshaltests = ejb servlet jsp appclient
-com/sun/ts/tests/rmiiiop/ee/standalone = ejb servlet jsp appclient
-
 com/sun/ts/tests/jaxm = ejb servlet jsp appclient
 
 #com/sun/ts/tests/saaj/ee/Standalone = ejb servlet jsp appclient

diff --git a/install/jdbc/bin/build.xml b/install/jdbc/bin/build.xml
@@ -24,7 +24,7 @@
 
     <target name="usage">
         <echo message="If you run ant in $${bin.dir}, use the following targets:"/>
-        <echo message="build.all build.all.tests build.all.smoke clean.all initdb start.rmiiiop.server start.sunri.porting.server start.sunri.porting.server13 ts.version usage"/>
+        <echo message="build.all build.all.tests build.all.smoke clean.all initdb start.sunri.porting.server start.sunri.porting.server13 ts.version usage"/>
         <echo message="-"/>
         <echo message="If you run ant in a test directory, use the following targets:"/>
         <echo message="build clean runclient usage ld lld lc llc"/>
@@ -64,20 +64,16 @@
         com/sun/ts/tests/jsp,
         com/sun/ts/tests/appclient,
         com/sun/ts/tests/javamail,
-        com/sun/ts/tests/rmiiiop,
         com/sun/ts/tests/assembly,
         com/sun/ts/tests/jta,
         com/sun/ts/tests/samples"/>
 
       <elementappend original="${all.test.dir}" suffix="**/*.java" property="all.java.file"/>
 
-      <property name="rmiiiop.stub.dir" 
-                value="org/omg/stub/com/sun/ts/tests/rmiiiop" />
-
       <echo message="Compiling:${all.java.file}"/>
       <javac fork="true" srcdir="${ts.home}/src" 
             destdir="${class.dir}" 
-            includes="${all.java.file}, ${rmiiiop.stub.dir}/**/*.java"
+            includes="${all.java.file}"
             memoryInitialSize="100m"
             memoryMaximumSize="200m"
             debug="on" 
@@ -271,16 +267,6 @@
     </java>
   </target>
 
-  <target name="start.rmiiiop.server">
-    <java classname="com.sun.ts.tests.rmiiiop.ee.standalone.RMIIIOPServer" fork="yes" failonerror="yes" 
-      classpath="${ts.classpath}:${class.dir}">
-      <sysproperty key="java.security.policy"
-                   value="${bin.dir}/java.policy"/>
-      <arg line="-v"/>
-      <arg line="-p ${rmiiiop.http.server.port}"/>
-    </java>
-  </target>
-
   <target name="init" depends="get.harness.debug, default.harness.debug"/>
 
   <target name="get.harness.debug" if="env.HARNESS_DEBUG">

diff --git a/internal/docs/common/TDG.html b/internal/docs/common/TDG.html
@@ -1485,8 +1485,6 @@
 ts_env/ts_env.bat&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 $TS_HOME/build.properties
 <br>
-startrmiiiopserver&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-ant startrmiiiopserver
 </p>
 <div style="margin-bottom: 0in;">startSunRIPortingServer&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 ant startsunriportingserver</div>