[issue#211] Remove use of Jakarta Deployment and classes that use it (no replacement deployment interfaces added)

bin/coverage-build.xml

@@ -330,10 +330,10 @@
   <!-- lists webservices 1.2, JAX-WS 2.0 and Web Services Metadata (not sure    -->
   <!-- how these map to our assertion docs).                                    -->
 
-  <!-- Removed jaxws, saaj and jws from the code coverage as the corresponding  -->
+  <!-- Removed Jakarta Deployment, jaxws, saaj and jws from the code coverage as the corresponding  -->
   <!-- tests are no more part of Java EE 8 CTS                                  -->
   <target name="all" depends="start.log,jaxr,j2eetools-mgt,
-	                              j2eetools-deploy,jta,jdbc,ejb,connector,jaspic,
+	                              jta,jdbc,ejb,connector,jaspic,
 	                              jsp,el,servlet,jms,jacc,javaee,jstl,jpa,
 	                              jaxrpc,jaxrs,webservices,jsf,jsonp,
                                   jsonb,concurrency,websocket,rmiiiop,securityapi">
@@ -524,16 +524,6 @@
     </antcall>
   </target>
 
-  <target name="j2eetools-deploy">
-    <antcall target="calculate.coverage">
-      <param name="api.coverage.dir"  value="${coverage.base.dir}/j2eedeploy_1_2/api"/>
-      <param name="spec.coverage.dir"  value="${coverage.base.dir}/j2eedeploy_1_2/spec"/>
-      <param name="api.assertions"    value="${ts.docs.dir}/j2eedeploy/J2EEDeployJavaDocAssertions.xml"/>
-      <param name="spec.assertions"    value="${ts.docs.dir}/j2eedeploy/J2EEDeploySpecAssertions.xml"/>
-      <param name="test.src.dir"      value="/j2eetools/deploy"/>
-    </antcall>
-  </target>
-
   <target name="jta">
     <antcall target="calculate.coverage">
       <param name="api.coverage.dir"  value="${coverage.base.dir}/jta_1_1/api"/>

docker/build_jakartaeetck.sh

@@ -104,14 +104,6 @@ wget --progress=bar:force --no-cache $GF_BUNDLE_URL -O latest-glassfish.zip
 unzip -q -o latest-glassfish.zip
 ls -l $GF_HOME/$GF_TOPLEVEL_DIR/glassfish/
 
-#temporary fix to copy deployment jars - to be removed later
-wget --progress=bar:force --no-cache \
-      https://repo1.maven.org/maven2/javax/enterprise/deploy/javax.enterprise.deploy-api/1.7/javax.enterprise.deploy-api-1.7.jar \
-      -O $GF_HOME/$GF_TOPLEVEL_DIR/glassfish/modules/jakarta.enterprise.deploy-api.jar
-wget --progress=bar:force --no-cache \
-      https://repo1.maven.org/maven2/org/glassfish/main/deployment/deployment-client/5.1.0-RC2/deployment-client-5.1.0-RC2.jar \
-      -O $GF_HOME/$GF_TOPLEVEL_DIR/glassfish/modules/deployment-client.jar
-#temporary fix to copy deployment jars - to be removed later
 
 if [ ! -z "$GF_VERSION_URL" ]; then
   wget --progress=bar:force --no-cache $GF_VERSION_URL -O glassfish.version

docker/build_standalone-tcks.sh

@@ -45,15 +45,6 @@ if [ ! -z "$GF_VERSION_URL" ]; then
   cat glassfish.version
 fi
 
-#temporary fix to copy deployment jars - to be removed later
-wget --progress=bar:force --no-cache \
-      https://repo1.maven.org/maven2/javax/enterprise/deploy/javax.enterprise.deploy-api/1.7/javax.enterprise.deploy-api-1.7.jar \
-      -O $GF_HOME/glassfish6/glassfish/modules/jakarta.enterprise.deploy-api.jar
-wget --progress=bar:force --no-cache \
-      https://repo1.maven.org/maven2/org/glassfish/main/deployment/deployment-client/5.1.0-RC2/deployment-client-5.1.0-RC2.jar \
-      -O $GF_HOME/glassfish6/glassfish/modules/deployment-client.jar
-#temporary fix to copy deployment jars - to be removed later
-
 export ANT_OPTS="-Xmx2G -Djava.endorsed.dirs=${BASEDIR}/$GF_TOPLEVEL_DIR/glassfish/modules/endorsed \
 -Djavax.xml.accessExternalStylesheet=all \
 -Djavax.xml.accessExternalSchema=all \

docker/fix_classpaths.sh

@@ -6,7 +6,6 @@ sed -i 's/javax.ejb-api.jar/jakarta.ejb-api.jar/g' ${CTS_HOME}/jakartaeetck/bin/
 sed -i 's/javax.el.jar/jakarta.el.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
 sed -i 's/javax.enterprise.concurrent-api.jar/jakarta.enterprise.concurrent-api.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
 sed -i 's/javax.enterprise.concurrent.jar/jakarta.enterprise.concurrent.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
-sed -i 's/javax.enterprise.deploy-api.jar/jakarta.enterprise.deploy-api.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
 sed -i 's/javax.faces.jar/jakarta.faces.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
 sed -i 's/javax.inject.jar/jakarta.inject.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
 sed -i 's/javax.interceptor-api.jar/jakarta.interceptor-api.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte

docker/run_jakartaeetck.sh

@@ -361,7 +361,7 @@ sed -i "s/^wsgen.ant.classname=.*/wsgen.ant.classname=$\{ri.wsgen.ant.classname\
 sed -i "s/^wsimport.ant.classname=.*/wsimport.ant.classname=$\{ri.wsimport.ant.classname\}/g" ts.jte
 
 if [[ "$PROFILE" == "web" || "$PROFILE" == "WEB" ]]; then
-  sed -i "s/^javaee.level=.*/javaee.level=web connector jaxws jaxb javamail javaeemgmt javaeedeploy jacc jaspic wsmd/g" ts.jte
+  sed -i "s/^javaee.level=.*/javaee.level=web connector jaxws jaxb javamail javaeemgmt jacc jaspic wsmd/g" ts.jte
   sed -i "s/^optional.tech.packages.to.ignore=.*/optional.tech.packages.to.ignore=javax.xml.rpc.handler/g" ts.jte
 fi
 

docker/scripts/tcks/concurrencytck.sh

@@ -34,7 +34,7 @@ rm -f $TS_HOME/dist/com/sun/ts/tests/concurrency/spec/ContextService/contextProp
 
 cd $TS_HOME/bin
 sed -i "s#^webcontainer\.home=.*#webcontainer.home=$TCK_HOME/glassfish5/glassfish#g" ts.jte
-sed -i 's#^concurrency\.classes=.*#concurrency.classes=${webcontainer.home}/modules/javax.enterprise.concurrent-api.jar${pathsep}${webcontainer.home}/modules/javax.servlet-api.jar${pathsep}${webcontainer.home}/modules/jakarta.ejb-api.jar${pathsep}${webcontainer.home}/modules/jta.jar${pathsep}${webcontainer.home}/modules/javax.enterprise.deploy-api.jar#g' ts.jte
+sed -i 's#^concurrency\.classes=.*#concurrency.classes=${webcontainer.home}/modules/javax.enterprise.concurrent-api.jar${pathsep}${webcontainer.home}/modules/javax.servlet-api.jar${pathsep}${webcontainer.home}/modules/javax.ejb-api.jar${pathsep}${webcontainer.home}/modules/jta.jar#g' ts.jte
 sed -i "s#^report.dir=.*#report.dir=$TCK_HOME/concurrencytckreport#g" ts.jte
 sed -i "s#^work.dir=.*#work.dir=$TCK_HOME/concurrencytckwork#g" ts.jte
 

install/jakartaee/bin/build.xml

@@ -51,7 +51,6 @@
                   com/sun/ts/tests/jta,
                   com/sun/ts/tests/samples,
                   com/sun/ts/tests/j2eetools/mgmt,
-                  com/sun/ts/tests/j2eetools/deploy,
                   com/sun/ts/tests/jaxr,
                   com/sun/ts/tests/jms,
                   com/sun/ts/tests/jsonp,
@@ -195,32 +194,6 @@
 		</java>
 	</target>
 
-	<target name="start.standard.deployment.server" depends="init">
-		<java classname="com.sun.ts.lib.deliverable.cts.deploy.StandardDeployment14Server" 
-              fork="yes"
-              classpath="${ts.standard.deployment.server.classpath}">
-			<sysproperty key="org.omg.CORBA.ORBInitialHost" value="${orb.host.ri}"/>
-			<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port.ri}"/>
-			<sysproperty key="com.sun.enterprise.home" value="${javaee.home.ri}"/>
-			<sysproperty key="cts.harness.debug" value="${cts.harness.debug}"/>
-			<sysproperty key="deliverable.class" value="${deliverable.class}" />
-			<sysproperty key="java.compiler" value="NONE"/>
-			<sysproperty key="TS_HOME" value="${ts.home}" />
-			<sysproperty key="ts.home" value="${ts.home}" />
-			<sysproperty key="pathsep" value="${pathsep}" />
-			<sysproperty key="J2EE_HOME" value="${javaee.home}" />
-			<sysproperty key="JAVA_HOME" value="${java.home}"  />
-			<sysproperty key="java.security.policy" value="${bin.dir}/harness.policy" />
-			<sysproperty key="cts.harness.debug" value="${cts.harness.debug}"/>
-			<sysproperty key="windir" value="${env.windir}" />
-			<sysproperty key="SYSTEMROOT" value="${env.SystemRoot}" />
-			<sysproperty key="javatest.security.allowPropertiesAccess" value="true" />
-			<sysproperty key="java.endorsed.dirs" value="${ri.java.endorsed.dirs}" />
-			<sysproperty key="com.sun.enterprise.home" value="${javaee.home.ri}"/>
-			<sysproperty key="com.sun.aas.installRoot" value="${javaee.home.ri}"/>
-		</java>
-	</target>
-
 	<target name="start.auto.deployment.server" depends="init">
 		<java classname="com.sun.ts.lib.implementation.sun.javaee.glassfish.AutoDeploymentServer"
               fork="yes"
@@ -846,8 +819,6 @@
 				<include name="${lib.pkg.dir}/tests/security/**"/>
 				<include name="${lib.pkg.dir}/tests/jdbc/**"/>
 				<include name="${lib.pkg.dir}/tests/jpa/storedprocedures/**"/>
-				<include name="${lib.pkg.dir}/porting/TSDeploymentInterface2*"/>
-				<include name="${lib.pkg.dir}/porting/TSDeployment2*"/>
 				<include name="${provider.dir}/"/>
 
 			</fileset>
@@ -866,8 +837,6 @@
                             ${lib.pkg.dir}/tests/jdbc/CS_Procs.java,
                             ${lib.pkg.dir}/tests/security/**/*.java,
                             ${lib.pkg.dir}/tests/jpa/storedprocedures/**,
-                            ${lib.pkg.dir}/porting/TSDeploymentInterface2*.java,
-                            ${lib.pkg.dir}/porting/TSDeployment2*.java,
                             ${provider.dir}/**"
                   excludes="${lib.pkg.dir}/implementation/sun/javaee/SunRIDeployment.java,
                             ${lib.pkg.dir}/implementation/sun/javaee/SunRIDeployment1*.java,
@@ -878,7 +847,6 @@
 				<pathelement path="${ts.lib.classpath}" />
 			</classpath>
 		</ts.javac>
-		<rmic classname="com.sun.ts.lib.deliverable.cts.deploy.StandardDeployment14Server" base="${class.dir}"/>
 		<rmic classname="com.sun.ts.lib.implementation.sun.javaee.glassfish.AutoDeploymentServer" base="${class.dir}"/>
 	</target>
 
@@ -911,8 +879,6 @@
 			<include name="${lib.pkg.dir}/deliverable/cts/**"/>
 			<include name="${lib.pkg.dir}/implementation/sun/javaee/**"/>
 			<include name="${lib.pkg.dir}/implementation/sun/common/**"/>
-			<include name="${lib.pkg.dir}/porting/TSDeploymentInterface2*"/>
-			<include name="${lib.pkg.dir}/porting/TSDeployment2*"/>
 			<include name="${lib.pkg.dir}/tests/security/**"/>
 		</ts.lib.jar>
 

install/jakartaee/bin/sig-test-pkg-list.txt

@@ -54,14 +54,6 @@ javax.el
 javax.enterprise.concurrent
 javax.enterprise.context
 javax.enterprise.context.spi
-javax.enterprise.deploy.model
-javax.enterprise.deploy.model.exceptions
-javax.enterprise.deploy.shared
-javax.enterprise.deploy.shared.factories
-javax.enterprise.deploy.spi
-javax.enterprise.deploy.spi.exceptions
-javax.enterprise.deploy.spi.factories
-javax.enterprise.deploy.spi.status
 javax.enterprise.event
 javax.enterprise.inject
 javax.enterprise.inject.spi

install/jakartaee/bin/sig-test-pkg-list_se11.txt

@@ -54,14 +54,6 @@ jakarta.enterprise.concurrent
 jakarta.enterprise.context
 jakarta.enterprise.context.control
 jakarta.enterprise.context.spi
-javax.enterprise.deploy.model
-javax.enterprise.deploy.model.exceptions
-javax.enterprise.deploy.shared
-javax.enterprise.deploy.shared.factories
-javax.enterprise.deploy.spi
-javax.enterprise.deploy.spi.exceptions
-javax.enterprise.deploy.spi.factories
-javax.enterprise.deploy.spi.status
 jakarta.enterprise.event
 jakarta.enterprise.inject
 jakarta.enterprise.inject.literal

install/jakartaee/bin/sig-test-pkg-list_se8.txt

@@ -54,14 +54,6 @@ jakarta.enterprise.concurrent
 jakarta.enterprise.context
 jakarta.enterprise.context.control
 jakarta.enterprise.context.spi
-javax.enterprise.deploy.model
-javax.enterprise.deploy.model.exceptions
-javax.enterprise.deploy.shared
-javax.enterprise.deploy.shared.factories
-javax.enterprise.deploy.spi
-javax.enterprise.deploy.spi.exceptions
-javax.enterprise.deploy.spi.factories
-javax.enterprise.deploy.spi.status
 jakarta.enterprise.event
 jakarta.enterprise.inject
 jakarta.enterprise.inject.literal

install/jakartaee/bin/sig-test-pkg-list_se9.txt

@@ -55,14 +55,6 @@ javax.enterprise.concurrent
 javax.enterprise.context
 javax.enterprise.context.control
 javax.enterprise.context.spi
-javax.enterprise.deploy.model
-javax.enterprise.deploy.model.exceptions
-javax.enterprise.deploy.shared
-javax.enterprise.deploy.shared.factories
-javax.enterprise.deploy.spi
-javax.enterprise.deploy.spi.exceptions
-javax.enterprise.deploy.spi.factories
-javax.enterprise.deploy.spi.status
 javax.enterprise.event
 javax.enterprise.inject
 javax.enterprise.inject.literal

install/jakartaee/bin/sig-test.map

@@ -148,9 +148,6 @@ javax.xml.registry=1.0_se6
 # Java EE Management 1.1 
 javax.management.j2ee=1.1_se6
 
-# Java EE Deployment 1.2 
-javax.enterprise.deploy=1.2_se6
-
 # JACC 1.2 
 jakarta.security.jacc=1.2_se6
 

install/jakartaee/bin/sig-test_se9.map

@@ -147,9 +147,6 @@ javax.xml.registry=1.0_se8
 # Java EE Management 1.1 
 javax.management.j2ee=1.1_se8
 
-# Java EE Deployment 1.2 
-javax.enterprise.deploy=1.2_se8
-
 # JACC 1.5 
 jakarta.security.jacc=1.5_se8