diff --git a/bin/coverage-build.xml b/bin/coverage-build.xml
deleted file mode 100644
index 87cebe4694..0000000000
--- a/bin/coverage-build.xml
+++ /dev/null
@@ -1,633 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
-    Copyright (c) 2018, 2022 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
-
--->
-
-<project name="Assertion Coverage Generation" default="usage" basedir=".">
-  
-  <!-- ######################################################################## -->
-  <!-- ######################################################################## -->
-  <!--  This ant build file generates the coverage numbers for each technology  -->
-  <!--  area that is part of the J2EE TCK.  Each technology area has a target   -->
-  <!--  defined in this file which generates the coverage numbers for that      -->
-  <!--  technology area.  There is also an "all" target that generates all the  -->
-  <!--  coverage numbers for all defined technology targets.                    -->
-  <!--                                                                          -->
-  <!--  To define a new target copy one of the existing targets and supply the  -->
-  <!--  appropriate properties.  Or use one of the template proerties listed at -->
-  <!--  the end of this file.  The user must define the following params:       -->
-  <!--    api.coverage.dir : location to write API coverage results to          -->
-  <!--    api.assertions   : location of API assertion document                 -->
-  <!--    spec.coverage.dir: location to write SPEC coverage results to         -->
-  <!--    spec.assertions  : location of SPEC assertion document                -->
-  <!--    test.src.dir     : relative location of test source code              -->
-  <!--    filter.string    : this is an optional parameter, it is only used in  -->
-  <!--                       the case where users want to pass a filter string  -->
-  <!--                       to the legacy assert utility (see the legacy       -->
-  <!--                       assert utility README for details)                 -->
-  <!--                                                                          -->
-  <!--  Note: Some technologies only have API or SPEC assertions.  In those     -->
-  <!--        cases omit the params that do not apply.  For instance, if your   -->
-  <!--        technology only has API assertions delete the spec.coverage.dir   -->
-  <!--        and spec.assertions parameters from your technology task.         -->
-  <!--                                                                          -->
-  <!--                                                                          -->
-  <!--  After defining your technolgy target, add your technology target name   -->
-  <!--  to the depends list of the all target if your technology is part of the -->
-  <!--  EE platform specification. This will cause your technology coverage     -->
-  <!--  to be invoked when the all target is invoked.                           -->
-  <!-- ######################################################################## -->
-  <!-- ######################################################################## -->
-
-
-  <!-- ############################################################################ -->
-  <!--  Required properties                                                         -->
-  <!-- ############################################################################ -->
-
-  <property environment="env"/>
-  <property name="ts.home"                   value="${env.TS_HOME}"/>
-  <property name="ts.test.dir"               value="${ts.home}/src/com/sun/ts/tests"/>
-  <property name="ts.docs.dir"               value="${ts.home}/internal/docs"/>
-  <property name="ts.tools.home"             value="${env.TS_TOOLS_HOME}"/>
-  <property name="assertion.coverage"        value="${ts.tools.home}/tools/assertion-coverage"/>
-  <property name="legacy.assert"             value="${ts.tools.home}/tools/legacy-assert"/>
-  <property name="xsl.transform"             value="${ts.tools.home}/tools/xsl-transformer"/>
-  <property name="local.dtd.dir"             value="${ts.tools.home}/docs/dtd/assertions"/>
-  <property name="verify.src.assertions"     value="true"/>
-  <property name="legacy.assert.output"      value="/tmp/legacy-assert-output.temp"/>
-  <property name="legacy.assert.output.spec" value="/tmp/spec-legacy-assert-output.temp"/>
-  <property name="legacy.assert.output.api"  value="/tmp/api-legacy-assert-output.temp"/>
-  <property name="coverage.base.dir"         value="${ts.home}/tmp/assertion-coverage"/>
-  <property name="backup.ext"                value="bak"/> 
-  <property name="api.stylesheet"            value="${ts.tools.home}/docs/xsl/assertions/javadoc_assertions.xsl"/>
-  <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,jsf,jstl,assembly,
-                              ejb30,internal,jdbc,jsonb,jta,saaj,concurrency,ejb32,
-                              javaee,jaxrs,jms,jsonp,jws,samples,common,connector,el,javamail,servlet,
-                              webservices13,websocket,xa,jaxws,jpa,jsp,webservices12"/>
- 
-  <taskdef resource="net/sf/antcontrib/antlib.xml"
-             classpath="${ts.home}/lib/ant-contrib-1.0b3.jar"/>
-
-  <!-- ############################################################################ -->
-  <!--  Helper targets used to calculate coverage numbers for each technology area  -->
-  <!-- ############################################################################ -->
-
-  <target name="check.ts.home" unless="env.TS_HOME">
-    <fail message="Please set the &quot;TS_HOME&quot; environment variable to an appropriate value."/>
-  </target>
-
-  <target name="check.ts.tools.home" unless="env.TS_TOOLS_HOME">
-    <fail message="Please set the &quot;TS_TOOLS_HOME&quot; environment variable to an appropriate value."/>
-  </target>
-
-  <target name="check.src.dir" unless="test.src.dir.specified">
-    <fail message="Please specify a valid value for the &quot;test.src.dir&quot; property"/>
-  </target>
-
-  <target name="backup">
-    <property name="bak.dir" value="${move.dir}/bak"/>
-    <mkdir dir="${bak.dir}"/>
-    <copy todir="${bak.dir}" overwrite="true">
-      <fileset dir="${move.dir}">
-        <include name="*.xml"/>
-        <include name="*.html"/>
-      </fileset>
-    </copy>
-    <delete>
-      <fileset dir="${move.dir}">
-        <include name="*.xml"/>
-        <include name="*.html"/>
-      </fileset>
-    </delete>
-  </target>
-
-  <target name="build.api.assertions.html" if="do.api">
-    <echo message="Transforming API assertion doc:"/>
-    <echo message="    xml-file    = ${api.assertions}"/>
-    <echo message="    xslt-file   = ${api.stylesheet}"/>
-    <echo message="    output-file = ${api.coverage.dir}/${api.html.assertion.file}"/>
-    <ant dir="${xsl.transform}" target="run">
-      <property name="xml-file"       value="${api.assertions}"/>
-      <property name="xslt-file"      value="${api.stylesheet}"/>
-      <property name="output-file"    value="${api.coverage.dir}/${api.html.assertion.file}"/>
-      <property name="local-dtd-path" value="${local.dtd.dir}"/>
-    </ant>
-  </target>
-
-  <target name="build.spec.assertions.html" if="do.spec">
-    <echo message="Transforming SPEC assertion doc:"/>
-    <echo message="    xml-file    = ${spec.assertions}"/>
-    <echo message="    xslt-file   = ${spec.stylesheet}"/>
-    <echo message="    output-file = ${spec.coverage.dir}/${spec.html.assertion.file}"/>
-    <ant dir="${xsl.transform}" target="run">
-      <property name="xml-file"       value="${spec.assertions}"/>
-      <property name="xslt-file"      value="${spec.stylesheet}"/>
-      <property name="output-file"    value="${spec.coverage.dir}/${spec.html.assertion.file}"/>
-      <property name="local-dtd-path" value="${local.dtd.dir}"/>
-    </ant>
-  </target>
-
-  <target name="generate.spec.assertion.coverage" if="do.spec">
-    <antcall target="backup">
-      <param name="move.dir" value="${spec.coverage.dir}"/>
-    </antcall>
-    <echo message="assertion-coverage (SPEC):"/>
-    <echo message="    all-assertions-file    = ${spec.assertions}"/>
-    <echo message="    tested-assertions-file = ${legacy.assert.output.spec}"/>
-    <echo message="    coverage-dir           = ${spec.coverage.dir}"/>
-    <ant dir="${assertion.coverage}" target="run">
-      <property name="all-assertions-file"    value="${spec.assertions}"/>
-      <property name="tested-assertions-file" value="${legacy.assert.output.spec}"/>
-      <property name="coverage-dir"           value="${spec.coverage.dir}"/>
-      <property name="local-dtd-path"         value="${local.dtd.dir}"/>
-      <property name="verify-source-code-ids" value="${verify.src.assertions}"/>
-    </ant>
-  </target>
-
-  <target name="generate.api.assertion.coverage" if="do.api">
-    <antcall target="backup">
-      <param name="move.dir" value="${api.coverage.dir}"/>
-    </antcall>
-    <echo message="assertion-coverage (API):"/>
-    <echo message="    all-assertions-file    = ${api.assertions}"/>
-    <echo message="    tested-assertions-file = ${legacy.assert.output.api}"/>
-    <echo message="    coverage-dir           = ${api.coverage.dir}"/>
-    <ant dir="${assertion.coverage}" target="run">
-      <property name="all-assertions-file"    value="${api.assertions}"/>
-      <property name="tested-assertions-file" value="${legacy.assert.output.api}"/>
-      <property name="coverage-dir"           value="${api.coverage.dir}"/>
-      <property name="local-dtd-path"         value="${local.dtd.dir}"/>
-      <property name="verify-source-code-ids" value="${verify.src.assertions}"/>
-    </ant>
-  </target>
-
-  <target name="generate.assertion.list.no.filter" unless="use.filter">
-    <echo message="legacy-assert:"/>
-    <echo message="    output.filename = ${legacy.assert.output}"/>
-    <echo message="    initial.dir     = ${test.src.dir}"/>
-    <ant dir="${legacy.assert}" target="get.assertions">
-      <property name="output.filename"     value="${legacy.assert.output}"/>
-      <property name="initial.dir"         value="${test.src.dir}"/>
-      <property name="queue.handler.class" value="com.sun.ts.legacy.SplitCoverageHandler"/>
-    </ant>
-  </target>
-
-  <target name="generate.assertion.list.filter" if="use.filter">
-    <echo message="legacy-assert:"/>
-    <echo message="    assertion.filter = ${filter.string}"/>
-    <echo message="    output.filename  = ${legacy.assert.output}"/>
-    <echo message="    initial.dir      = ${test.src.dir}"/>
-    <ant dir="${legacy.assert}" target="get.assertions">
-      <property name="output.filename"     value="${legacy.assert.output}"/>
-      <property name="assertion.filter"    value="${filter.string}"/>
-      <property name="initial.dir"         value="${test.src.dir}"/>
-      <property name="queue.handler.class" value="com.sun.ts.legacy.SplitCoverageHandler"/>
-    </ant>
-  </target>
-
-  <target name="calculate.coverage" depends="check.ts.home,check.ts.tools.home">
-    <condition property="do.api">
-      <and>
-        <not>
-          <equals arg1="${api.coverage.dir}" arg2="$${api.coverage.dir}"/>
-        </not>
-        <not>
-          <equals arg1="${api.assertions}" arg2="$${api.assertions}"/>
-        </not>
-      </and>
-    </condition>
-    <condition property="do.spec">
-      <and>
-        <not>
-          <equals arg1="${spec.coverage.dir}" arg2="$${spec.coverage.dir}"/>
-        </not>
-        <not>
-          <equals arg1="${spec.assertions}" arg2="$${spec.assertions}"/>
-        </not>
-      </and>
-    </condition>
-    <condition property="use.filter">
-      <not>
-        <equals arg1="${filter.string}" arg2="$${filter.string}"/>
-      </not>
-    </condition>
-    <condition property="test.src.dir.specified">
-      <not>
-        <equals arg1="${test.src.dir}" arg2="$${test.src.dir}"/>
-      </not>
-    </condition>
-    <antcall target="check.src.dir"/>
-    <antcall target="generate.assertion.list.filter"/>
-    <antcall target="generate.assertion.list.no.filter"/>
-    <antcall target="generate.api.assertion.coverage"/>
-    <antcall target="generate.spec.assertion.coverage"/>
-    <antcall target="build.api.assertions.html"/>    
-    <antcall target="build.spec.assertions.html"/>
-  </target>
-
-  <property name="gen.index.dir" value="${ts.tools.home}/tools/gen-index"/>
-  <target name="generate.index.page">
-    <echo message=""/>
-    <echo message="gen-index:"/>
-    <echo message="    base.dir = ${coverage.base.dir}"/>
-    <echo message=""/>
-    <ant dir="${gen.index.dir}" target="run">
-      <property name="base.dir" value="${coverage.base.dir}"/>
-    </ant>
-  </target>
-
-  <property name="gen.summary.dir" value="${ts.tools.home}/tools/gen-summary"/>
-  <target name="generate.exec.summary">
-    <echo message=""/>
-    <echo message="gen-exec-summary:"/>
-    <echo message="    base.dir = ${coverage.base.dir}"/>
-    <echo message=""/>
-    <ant dir="${gen.summary.dir}" target="run">
-      <property name="base.dir" value="${coverage.base.dir}"/>
-    </ant>
-  </target>
-
-  <property name="document.dir"  value="${ts.docs.dir}/html-assertions"/>
-  <property name="assertion.jar" value="${document.dir}/JavaEE_7.0_Assertion_Docs.jar"/>
-  <target name="copy.html.assertions">
-    <copy todir="${document.dir}">
-      <fileset dir="${coverage.base.dir}">
-        <include name="**/api-assertions.html"/>
-        <include name="**/spec-assertions.html"/>
-        <include name="assertion-index.html"/>
-        <exclude name="**/bak/*"/>
-      </fileset>
-    </copy>
-    <delete file="${assertion.jar}" failonerror="false"/>
-    <jar destfile="${assertion.jar}" basedir="${document.dir}"/>
-  </target>
-
-  <target name="set.permissions">
-    <chmod perm="777" type="both">
-      <fileset dir="${coverage.base.dir}" includes="**,**/*"/>
-    </chmod>
-  </target>
-
-  <target name="build.page">
-    <antcall target="generate.exec.summary"/>
-    <antcall target="generate.index.page"/>
-    <antcall target="set.permissions"/>
-  </target>
-
-  <target name="start.log">
-   <record name="coverage.log" action="start"/>
-  </target>
-	
-  <target name="delete.metrics">
-    <delete includeemptydirs="true" failonerror="false">
-	  <fileset dir="${coverage.base.dir}" includes="**/*"/>
-	</delete>
-  </target>
-
-  <!-- APIs that are required by EE 6 spec but are missing assertion artifacts: -->
-  <!-- JavaMail, JAF, connector, JAXB, Common Annotations (sorta, each area     -->
-  <!-- must test these), JSP Debugging (may be included with jsp area,          -->
-  <!-- not sure), stax. We also need to clean up webservices, the EE 5 spec     -->
-  <!-- lists webservices 1.2, JAX-WS 2.0 and Web Services Metadata (not sure    -->
-  <!-- how these map to our assertion docs).                                    -->
-  
-  <!-- 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,
-	                              jta,jdbc,ejb,connector,
-	                              jsp,el,servlet,jms,javaee,jstl,jpa,
-	                              jaxrs,webservices,jsf,
-                                concurrency,websocket">
-    <antcall target="generate.exec.summary"/>
-    <antcall target="generate.index.page"/>
-    <antcall target="set.permissions"/>
-    <record name="coverage.log" action="stop"/>
-  </target>
-	
-  <target name="dougs.stuff" depends="start.log,jsp,el,jstl,jsf">
-    <antcall target="generate.exec.summary"/>
-    <antcall target="generate.index.page"/>
-    <antcall target="set.permissions"/>
-    <record name="coverage.log" action="stop"/>
-  </target>
-
-  <!-- ############################################################################ -->
-  <!--  Default target                                                              -->
-  <!-- ############################################################################ -->
-  <target name="usage">
-    <echo message="Usage ant -buildfile coverage-build.xml &lt;target&gt;"/>
-	<echo message="  Where &lt;target&gt; can be:"/>
-	<echo message="    usage   : Prints this message."/>
-	<echo message="    all     : Calculates the assertion coverage numbers"/>
-	<echo message="              for all defined technology targets."/>
-	<echo message=""/>
-	<echo message="Note: TS_HOME must be set to a valid TS workspace location and"/>
-	<echo message="      TS_TOOLS_HOME must be set to a valid tools location that"/>
-	<echo message="      has been built."/>
-	<echo message=""/>
-  </target>
-	
-	
-  <!-- ############################################################################ -->
-  <!--  Targets to create the assertion coverage numbers for each technology area   -->
-  <!-- ############################################################################ -->
-
-  <target name="javaee">
-    <for param="srcdir" list="${srcdirs}"
-                          trim="true" delimiter=",">
-      <sequential>
-        <antcall target="calculate.coverage">
-          <param name="spec.coverage.dir" value="${coverage.base.dir}/javaee_8/spec"/>
-          <param name="spec.assertions"   value="${ts.docs.dir}/javaee/JavaEESpecAssertions.xml"/> 
-          <param name="test.src.dir"      value="/@{srcdir}"/>
-          <param name="filter.string"     value="JavaEE"/>
-        </antcall>
-      </sequential>
-    </for>
-  </target>
-
-  <target name="connector">
-    <antcall target="calculate.coverage">   
-      <param name="spec.coverage.dir" value="${coverage.base.dir}/connector_1_7/spec"/>
-      <param name="spec.assertions"   value="${ts.docs.dir}/connector/ConnectorSpecAssertions.xml"/>
-      <param name="api.coverage.dir"  value="${coverage.base.dir}/connector_1_7/api"/>
-      <param name="api.assertions"    value="${ts.docs.dir}/connector/ConnectorAPIAssertions-nums.xml"/>
-      <param name="test.src.dir"      value="/connector"/>
-      <param name="filter.string"     value="Connector"/>
-    </antcall>
-  </target>
-
-  <target name="standalone-connector">
-    <antcall target="calculate.coverage">   
-      <param name="spec.coverage.dir" value="${coverage.base.dir}/connector_1_7/spec"/>
-      <param name="spec.assertions"   value="${ts.docs.dir}/connector/StandaloneConnectorSpecAssertions.xml"/>
-      <param name="api.coverage.dir"  value="${coverage.base.dir}/connector_1_7/api"/>
-      <param name="api.assertions"    value="${ts.docs.dir}/connector/StandaloneConnectorAPIAssertions-nums.xml"/>
-      <param name="test.src.dir"      value="/connector"/>
-      <param name="filter.string"     value="Connector"/>
-    </antcall>
-  </target>
-
-  <target name="jaxws">
-    <antcall target="calculate.coverage">
-      <param name="api.coverage.dir"  value="${coverage.base.dir}/jaxws_2_2/api"/>
-      <param name="spec.coverage.dir" value="${coverage.base.dir}/jaxws_2_2/spec"/>
-      <param name="api.assertions"    value="${ts.docs.dir}/jaxws/JAXWSJavadocAssertions.xml"/>
-      <param name="spec.assertions"   value="${ts.docs.dir}/jaxws/JAXWSSpecAssertions.xml"/>
-      <param name="test.src.dir"      value="/jaxws"/>
-    </antcall>
-  </target>
-
-  <target name="jws">
-    <antcall target="calculate.coverage">
-      <param name="spec.coverage.dir" value="${coverage.base.dir}/jws_2_1/spec"/>
-      <param name="spec.assertions"   value="${ts.docs.dir}/jws/JWSSpecAssertions.xml"/>
-      <param name="test.src.dir"      value="/jws"/>
-    </antcall>
-  </target>
-
-  <target name="saaj">
-    <antcall target="calculate.coverage">
-      <param name="api.coverage.dir"  value="${coverage.base.dir}/saaj_1_3/api"/>
-      <param name="spec.coverage.dir" value="${coverage.base.dir}/saaj_1_3/spec"/>
-      <param name="api.assertions"    value="${ts.docs.dir}/saaj/SAAJJavadocAssertions.xml"/>
-      <param name="spec.assertions"   value="${ts.docs.dir}/saaj/SAAJSpecAssertions.xml"/>
-      <param name="test.src.dir"      value="/saaj"/>
-    </antcall>
-  </target>
-
-  <target name="jms">
-    <antcall target="calculate.coverage">
-      <param name="api.coverage.dir"  value="${coverage.base.dir}/jms_2_0/api"/>
-      <param name="spec.coverage.dir" value="${coverage.base.dir}/jms_2_0/spec"/>
-      <param name="api.assertions"    value="${ts.docs.dir}/jms/JMSJavadocAssertions.xml"/>
-      <param name="spec.assertions"   value="${ts.docs.dir}/jms/JMSSpecAssertions.xml"/>
-      <param name="test.src.dir"      value="/jms"/>
-    </antcall>
-  </target>
-
-  <target name="jta">
-    <antcall target="calculate.coverage">
-      <param name="api.coverage.dir"  value="${coverage.base.dir}/jta_1_1/api"/>
-      <param name="api.assertions"    value="${ts.docs.dir}/jta/JTAJavadocAssertions.xml"/>
-      <param name="test.src.dir"      value="/jta"/>
-    </antcall>
-  </target>
-
-  <target name="jdbc">
-    <antcall target="calculate.coverage">
-      <param name="api.coverage.dir"  value="${coverage.base.dir}/jdbc_3_0/api"/>
-      <param name="spec.coverage.dir" value="${coverage.base.dir}/jdbc_3_0/spec"/>
-      <param name="api.assertions"    value="${ts.docs.dir}/jdbc/JDBCJavadocAssertions.xml"/>
-      <param name="spec.assertions"   value="${ts.docs.dir}/jdbc/JDBCSpecAssertions.xml"/>
-      <param name="test.src.dir"      value="/jdbc"/>
-    </antcall>
-  </target>
-
-  <target name="ejb">
-    <for param="srcdir" list="${srcdirs}"
-                          trim="true" delimiter=",">
-      <sequential>
-        <antcall target="calculate.coverage">
-          <param name="api.coverage.dir"  value="${coverage.base.dir}/ejb_3_2/api"/>
-          <param name="spec.coverage.dir" value="${coverage.base.dir}/ejb_3_2/spec"/>
-          <param name="api.assertions"    value="${ts.docs.dir}/ejb/EJBJavaDocAssertions.xml"/>
-          <param name="spec.assertions"   value="${ts.docs.dir}/ejb/EJBSpecAssertions.xml"/>
-          <param name="test.src.dir"      value="/@{srcdir}"/>
-          <param name="filter.string"     value="EJB"/>
-        </antcall>
-     </sequential>
-   </for>
-  </target>
-
-  <target name="jsp">
-    <antcall target="calculate.coverage">
-      <param name="api.coverage.dir"  value="${coverage.base.dir}/jsp_2_2/api"/>
-      <param name="spec.coverage.dir" value="${coverage.base.dir}/jsp_2_2/spec"/>
-      <param name="api.assertions"    value="${ts.docs.dir}/jsp/JSPJavadocAssertions.xml"/>
-      <param name="spec.assertions"   value="${ts.docs.dir}/jsp/JSPSpecAssertions.xml"/>
-      <param name="test.src.dir"      value="/jsp"/>
-      <param name="filter.string"     value="JSP"/>
-    </antcall>
-  </target>
-
-  <target name="el">
-    <antcall target="calculate.coverage">
-      <param name="api.coverage.dir"  value="${coverage.base.dir}/el_3_0/api"/>
-      <param name="spec.coverage.dir" value="${coverage.base.dir}/el_3_0/spec"/>
-      <param name="api.assertions"    value="${ts.docs.dir}/el/ELJavadocAssertions.xml"/>
-      <param name="spec.assertions"   value="${ts.docs.dir}/el/ELSpecAssertions.xml"/>
-      <param name="test.src.dir"      value="/el"/>
-      <param name="filter.string"     value="EL"/>
-    </antcall>
-  </target>
-
-  <target name="servlet">
-    <antcall target="calculate.coverage">
-      <param name="api.coverage.dir"  value="${coverage.base.dir}/servlet_4_0/api"/>
-      <param name="spec.coverage.dir" value="${coverage.base.dir}/servlet_4_0/spec"/>
-      <param name="api.assertions"    value="${ts.docs.dir}/servlet/ServletJavadocAssertions.xml"/>
-      <param name="spec.assertions"   value="${ts.docs.dir}/servlet/ServletSpecAssertions.xml"/>
-      <param name="test.src.dir"      value="/servlet"/>
-    </antcall>
-  </target>
-
-  <target name="webservices">
-    <for param="srcdir" list="${srcdirs}"
-                        trim="true" delimiter=",">
-      <sequential>
-        <antcall target="calculate.coverage">
-          <param name="spec.coverage.dir" value="${coverage.base.dir}/webservices_1_3/spec"/>
-          <param name="spec.assertions"   value="${ts.docs.dir}/webservices/WEBSERVICESSpecAssertions.xml"/>
-          <param name="test.src.dir"      value="/@{srcdir}"/>
-          <param name="filter.string"     value="WS4EE"/>
-        </antcall>
-      </sequential>
-    </for>
-  </target>
-
-  <target name="jsf">
-    <antcall target="calculate.coverage">
-      <param name="api.coverage.dir"  value="${coverage.base.dir}/jsf_2_3/api"/>
-      <param name="spec.coverage.dir" value="${coverage.base.dir}/jsf_2_3/spec"/>
-      <param name="api.assertions"    value="${ts.docs.dir}/jsf/JSFJavadocAssertions.xml"/>
-      <param name="spec.assertions"   value="${ts.docs.dir}/jsf/JSFSpecAssertions.xml"/>
-      <param name="test.src.dir"      value="/jsf"/>
-      <param name="filter.string"     value="JSF"/>
-    </antcall>
-  </target>
-
-  <target name="jstl">
-    <antcall target="calculate.coverage">
-      <param name="spec.coverage.dir" value="${coverage.base.dir}/jstl_1_2/spec"/>
-      <param name="spec.assertions"   value="${ts.docs.dir}/jstl/JSTLSpecAssertions.xml"/>
-      <param name="test.src.dir"      value="/jstl"/>
-      <param name="filter.string"     value="JSTL"/>
-    </antcall>
-  </target>
-
-  <target name="jpa">
-    <antcall target="calculate.coverage">
-      <param name="api.coverage.dir"  value="${coverage.base.dir}/jpa_2_2/api"/>
-      <param name="spec.coverage.dir" value="${coverage.base.dir}/jpa_2_2/spec"/>
-      <param name="api.assertions"    value="${ts.docs.dir}/jpa/Persistence22JavadocAssertions.xml"/>
-      <param name="spec.assertions"   value="${ts.docs.dir}/jpa/PersistenceSpecAssertions.xml"/>
-      <param name="test.src.dir"      value="/jpa"/>
-      <param name="filter.string"     value="PERSISTENCE"/>
-    </antcall>
-  </target>
-
-  <target name="jpa-ee-only">
-    <antcall target="calculate.coverage">
-      <param name="api.coverage.dir"  value="${coverage.base.dir}/jpa_2_1/api"/>
-  	  <param name="spec.coverage.dir" value="${coverage.base.dir}/jpa_2_1/spec"/>
-      <param name="api.assertions"    value="${ts.docs.dir}/jpa/PersistenceJavaDocAssertions.xml"/>
-      <param name="spec.assertions"   value="${ts.docs.dir}/jpa/PersistenceSpecAssertions.xml"/>
-      <param name="test.src.dir"      value="/jpa/ee"/>
-      <param name="filter.string"     value="PERSISTENCE"/>
-    </antcall>
-  </target>
-
-  <target name="concurrency">
- 	<antcall target="calculate.coverage">
- 	  <param name="api.coverage.dir"  value="${coverage.base.dir}/concurrency_1_0/api"/>
- 	  <param name="api.assertions"    value="${ts.docs.dir}/concurrency/ConcurrencyJavadocAssertions.xml"/>
-      <param name="spec.coverage.dir" value="${coverage.base.dir}/concurrency_1_0/spec"/>
-      <param name="spec.assertions"   value="${ts.docs.dir}/concurrency/ConcurrencySpecAssertions.xml"/>
- 	  <param name="test.src.dir"      value="/concurrency"/>
- 	  <param name="filter.string"     value="CONCURRENCY"/>
- 	</antcall>
-  </target>
-
-  <!-- ############################################################################ -->
-  <!--  Targets listed below are currently undefined, can be used as templates      -->
-  <!-- ############################################################################ -->
-
-  <target name="jaas">
-    <antcall target="calculate.coverage">
-      <param name="api.coverage.dir"  value="${coverage.base.dir}/TBD/api"/>
-      <param name="spec.coverage.dir" value="${coverage.base.dir}/TBD/spec"/>
-      <param name="api.assertions"    value="${ts.docs.dir}/TBD"/>
-      <param name="spec.assertions"   value="${ts.docs.dir}/TBD"/>
-      <param name="test.src.dir"      value="/jaas"/>
-    </antcall>
-  </target>
-
-  <target name="javamail">
-    <antcall target="calculate.coverage">
-      <param name="api.coverage.dir"  value="${coverage.base.dir}/TBD/api"/>
-      <param name="spec.coverage.dir" value="${coverage.base.dir}/TBD/spec"/>
-      <param name="api.assertions"    value="${ts.docs.dir}/TBD"/>
-      <param name="spec.assertions"   value="${ts.docs.dir}/TBD"/>
-      <param name="test.src.dir"      value="/javamail"/>
-    </antcall>
-  </target>
-
-  <target name="jaxm">
-    <antcall target="calculate.coverage">
-      <param name="api.coverage.dir"  value="${coverage.base.dir}/TBD/api"/>
-      <param name="spec.coverage.dir" value="${coverage.base.dir}/TBD/spec"/>
-      <param name="api.assertions"    value="${ts.docs.dir}/TBD"/>
-      <param name="spec.assertions"   value="${ts.docs.dir}/TBD"/>
-      <param name="test.src.dir"      value="/jaxm"/>
-    </antcall>
-  </target>
-
-  <target name="jaxp">
-    <antcall target="calculate.coverage">
-      <param name="api.coverage.dir"  value="${coverage.base.dir}/TBD/api"/>
-      <param name="spec.coverage.dir" value="${coverage.base.dir}/TBD/spec"/>
-      <param name="api.assertions"    value="${ts.docs.dir}/TBD"/>
-      <param name="spec.assertions"   value="${ts.docs.dir}/TBD"/>
-      <param name="test.src.dir"      value="/jaxp"/>
-    </antcall>
-  </target>
-
-  <target name="soap">
-    <antcall target="calculate.coverage">
-      <param name="api.coverage.dir"  value="${coverage.base.dir}/TBD/api"/>
-      <param name="spec.coverage.dir" value="${coverage.base.dir}/TBD/spec"/>
-      <param name="api.assertions"    value="${ts.docs.dir}/TBD"/>
-      <param name="spec.assertions"   value="${ts.docs.dir}/TBD"/>
-      <param name="test.src.dir"      value="/soap"/>
-    </antcall>
-  </target>
-
-  <target name="websocket">
-    <antcall target="calculate.coverage">
-      <param name="api.coverage.dir"  value="${coverage.base.dir}/websocket_1_1/api"/>
-      <param name="spec.coverage.dir" value="${coverage.base.dir}/websocket_1_1/spec"/>
-      <param name="api.assertions"    value="${ts.docs.dir}/websocket/WebSocketJavadocAssertions.xml"/>
-      <param name="spec.assertions"   value="${ts.docs.dir}/websocket/WebSocketSpecAssertion.xml"/>
-      <param name="test.src.dir"      value="/websocket"/>
-    </antcall>
-  </target>
-
-  <target name="xa">
-    <antcall target="calculate.coverage">
-      <param name="api.coverage.dir"  value="${coverage.base.dir}/TBD/api"/>
-      <param name="spec.coverage.dir" value="${coverage.base.dir}/TBD/spec"/>
-      <param name="api.assertions"    value="${ts.docs.dir}/TBD"/>
-      <param name="spec.assertions"   value="${ts.docs.dir}/TBD"/>
-      <param name="test.src.dir"      value="/xa"/>
-    </antcall>
-  </target>
-
-</project>
diff --git a/bin/xml/impl/glassfish/common.xml b/bin/xml/impl/glassfish/common.xml
deleted file mode 100644
index 9fc10021c5..0000000000
--- a/bin/xml/impl/glassfish/common.xml
+++ /dev/null
@@ -1,1553 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
-    Copyright (c) 2018, 2020 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
-
--->
-
-<project name="Commonxml" basedir=".">
-
-    <!-- ========================================================== -->
-    <!--  CTS s1as.xml & javaee_ri.xml Common Properties & targets  -->
-    <!-- ========================================================== -->
-
-    <!-- IMPORTS -->
-    <import file="../../ts.common.props.xml"/>
-
-    <property name="server.start.delay.mins" value="1"/>
-    <property name="server" value="server"/> 
-    <property name="resources.dottedname.prefix" value="domain.resources"/>
-    <property name="server.policy" value="server.policy" />
-    <property name="server.policy.orig" value="${server.policy}_orig"/>
-    <property name="client.policy" value="client.policy" />
-    <property name="client.policy.orig" value="${client.policy}_orig"/>
-    <property name="sun-acc.xml.template" value="sun-acc.xml.template" />
-    <property name="sun-acc.xml.template.orig" value="sun-acc.xml.template.orig" />
-    <property name="timer.poolName" value="cts-derby-XA-pool"/>
-    <property name="keystore.password" value="changeit"/>
-    <property name="server.cert.alias" value="s1as"/>
-    <property name="client.cert.alias" value="cts"/>
-    <property name="NSSConfigDir" value="${s1as.domain.dir}/${s1as.domain.name}/config" />
-    <property name="appclient.log.level" value="INFO"/>
-    <property name="appclient.log.dir" value="${ts.home}/tmp/appclient"/>
-
-    <!--
-      Check to see if we are using the pointbase pool, if so
-      we will skip pinging the connection pool.
-    -->
-    <target name="checkIfUsingDerbyPool" >
-        <condition property="usingDerbyPool">
-          <equals arg1="${use.jdbc.poolName}" arg2="${use.derby.poolName}" casesensitive="true" trim="true"/>
-      </condition>
-    </target> 
-
-    <!--
-         configUnix will be invoked when ant is being run on
-         unix/Linux.  It will configure the values for ${os}
-         and ${dir.sep}
-
-         Due to differences on how ant invokes external commands
-         on windows, we need to execute asadmin and imqusermgr
-         differently on each platform.
-    -->
-
-    <target name="configUnix" depends="checkPlatform" if="isUnixPlatform" >
-           <echo message="on unix"/>
-           <property name="dir.sep" value="/"/>
-           <property name="exec.asadmin" value="${cli.path}" />
-           <property name="exec.asadmin.part2" value="" />
-           <property name="exec.imqusermgr" value="${imqbin.loc}/imqusermgr" />
-           <property name="exec.imqusermgr.part2" value="" />
-           <property name="cert.file" value="${bin.dir}/certificates/cts_cert"/>
-           <property name="server.config.dir.path" value="${server.domain}/${server.config.dir}" />
-           <property name="cacerts.jks" value="${server.config.dir.path}/cacerts.jks"/>
-           <property name="keystore.jks" value="${server.config.dir.path}/keystore.jks"/>
-           <property name="cert8.db" value="${server.config.dir.path}/cert8.db"/>
-           <property name="key3.db" value="${server.config.dir.path}/key3.db"/>
-           <property name="secmod.db" value="${server.config.dir.path}/secmod.db"/>
-           <property name="exec.keytool" value= "${java.home}/bin/keytool" />
-           <property name="exec.keytool.part2" value= "" />
-           <property name="exec.certutil" value= "${server.home}/lib/certutil" />
-           <property name="exec.certutil.part2" value= "" />
-           <property name="password.file.template"
-                     value="${common.bin.dir}/xml/impl/glassfish/templates/password.template"/>
-           <property name="password.file" value="${bin.dir}/password.txt"/>
-           <property name="nodeagent.path" value="" />
-    </target>
-
-    <!--
-         configWindows will be invoked when ant is being run on
-         windows.  It will configure the values for ${os}
-         and ${dir.sep}
-
-         Due to differences on how ant invokes external commands
-         on windows, we need to execute asadmin and imqusermgr
-         differently on each platform.
-    -->
-
-    <target name="configWindows" depends="checkPlatform" if="isWindowsPlatform" >
-           <echo message="on windows"/>
-           <property name="dir.sep" value="\\"/>
-           <property name="exec.asadmin" value="cmd.exe" />
-           <property name="exec.asadmin.part2" value= " /c ${cli.path}" />
-           <property name="exec.imqusermgr" value="cmd.exe" />
-           <property name="exec.imqusermgr.part2" value="/c ${imqbin.loc}\imqusermgr" />
-           <property name="cert.file" value="${ts.home}\bin\certificates\cts_cert"/>
-           <property name="server.config.dir.path" value="${server.domain}\${server.config.dir}" />
-           <property name="cacerts.jks" value="${server.config.dir.path}\cacerts.jks"/>
-           <property name="keystore.jks" value="${server.config.dir.path}\keystore.jks"/>
-           <property name="cert8.db" value="${server.config.dir.path}\cert8.db"/>
-           <property name="key3.db" value="${server.config.dir.path}\key3.db"/>
-           <property name="secmod.db" value="${server.config.dir.path}\secmod.db"/>
-           <property name="exec.keytool" value="cmd.exe" />
-           <property name="exec.keytool.part2" value= " /c ${java.home}\bin\keytool" />
-           <property name="exec.certutil" value= "${server.home}\lib\certutil" />
-           <property name="exec.certutil.part2" value= " /c ${server.home}/lib/certutil" />
-           <property name="password.file.template"
-                     value="${ts.home}\bin\xml\impl\glassfish\templates\password.template"/>
-           <property name="password.file" value="${ts.home}\bin\password.txt"/>
-           <property name="nodeagent.path" value="--agentdir ${drive}\${sjsas.node.agent.dir.name}" />
-    </target>
-
-    <!--
-      checkForFiles determines if the following files exist:
-      server.policy_orig
-      client.policy_orig
-    -->
-    <target name="checkForFiles">
-        <available file="${server.domain}/${server.config.dir}/${server.policy.orig}"
-           type="file" property="found.server.policy.orig"/>
-        <available file="${server.home}/lib/appclient/${client.policy.orig}"
-           type="file" property="found.client.policy.orig"/>
-
-         <condition property="java.keystore.generated" >
-           <and>
-             <available  file="${keystore.jks}" type="file" />
-             <available  file="${cacerts.jks}" type="file" />
-           </and>
-         </condition>
-
-         <condition property="found.nss.databases" >
-           <and>
-             <available  file="${cert8.db}" type="file" />
-             <available  file="${key3.db}" type="file" />
-             <available  file="${secmod.db}" type="file" />
-           </and>
-         </condition>
-
-    </target>
-
-    <target name="setNSSConfigDir" >
-	<condition property="NSSConfigDir" value="${s1as.domain.dir}/${s1as.domain.name}/config">
-	  <equals arg1="${sjsas.env.type}" arg2="das" casesensitive="true" trim="true"/>
-	</condition>
-
-	<condition property="NSSConfigDir" value="${javaee.home}/nodeagents/${sjsas.nodeagent.name}/${sjsas.nodeinstance.name}/config">
-	  <equals arg1="${sjsas.env.type}" arg2="remote" casesensitive="true" trim="true"/>
-	</condition>
-
-	<condition property="NSSConfigDir" value="${javaee.home}/nodeagents/${sjsas.nodeagent.name}/${sjsas.nodeinstance.name}/config">
-	  <equals arg1="${sjsas.env.type}" arg2="cluster" casesensitive="true" trim="true"/>
-	</condition>
-
-    </target>
-
-    <!--
-      copy.server.policy makes an archive copy of the server.policy
-      file.
-    -->
-    <target name="copy.server.policy" unless="found.server.policy.orig">
-        <copy file="${server.domain}/${server.config.dir}/${server.policy}"
-              tofile="${server.domain}/${server.config.dir}/${server.policy.orig}"
-              overwrite="yes" />
-    </target>
-
-    <!--
-      copy.client.policy  makes an archive copy of the client.policy
-      file.
-    -->
-    <target name="copy.client.policy" unless="found.client.policy.orig">
-        <copy file="${server.home}/lib/appclient/${client.policy}"
-              tofile="${server.home}/lib/appclient/${client.policy.orig}"
-              overwrite="yes" />
-    </target>
-
-
-    <!--
-      concat.security concatinates the cts files required to create:
-      server.policy
-      client.policy
-
-      with the saved original S1AS copies of the above files.
-
-    -->
-    <target name="concat.security"
-            depends="checkForFiles, copy.server.policy,  copy.client.policy">
-        <concat destfile="${server.domain}/${server.config.dir}/${server.policy}" >
-           <filelist dir="${server.domain}/${server.config.dir}" files="${server.policy.orig}" />
-           <filelist dir="${bin.dir}" files="server_policy.append" />
-        </concat>
-        <concat destfile="${server.home}/lib/appclient/${client.policy}" >
-           <filelist dir="${server.home}/lib/appclient" files="${client.policy.orig}" />
-           <filelist dir="${bin.dir}" files="client_policy.append" />
-        </concat>
-
-    </target>
-
-    <!--
-       Enable the S1AS security configuration settings
-    -->
-    <target name="enable.security" depends="concat.security"/>
-    
-    <!--
-        Filter and copy sun-acc.xml to $TS_HOME/tmp.
-        Also copy the needed DTD to $TS_HOME/tmp
-    -->
-    <target name="filter.sun-acc.xml" depends="configPlatform">
-       <!--<copy file="${as.base}/lib/install/templates/${sun-acc.xml.template}"-->
-       <copy file="${bin.dir}/xml/impl/glassfish/templates/${sun-acc.xml.template}"
-             tofile="${ts.home}/tmp/appclient/${sun-acc.xml}" overwrite="yes">
-           <filterset begintoken="%%%" endtoken="%%%">
-              <filter token="SERVER_ROOT" value="${as.base}" />
-              <filter token="SERVER_NAME" value="${sun-acc.host}" />
-              <filter token="ORB_LISTENER1_PORT" value="${sun-acc.port}" />
-           </filterset>
-        </copy>
-        
-        <if>
-            <istrue value="${appclient.log.output}"/>
-        <then>
-            <replace  file="${ts.home}/tmp/appclient/${sun-acc.xml}"
-                token="log-service file=&quot;&quot; level=&quot;WARNING&quot;"
-                value="log-service file=&quot;${appclient.log.dir}/${sun-acc.xml}.log&quot; level=&quot;${appclient.log.level}&quot;"/>    
-        </then>
-        </if>
-        
-    </target>
-
-    <!--
-        Start The App Server by calling the appropriate target
-        depending on whether we are on unix/linux or windows.
-    -->
-    <target name="start.appserver" depends="configPlatform" >
-
-       <antcall target="start.appserver.unix"/>
-       <antcall target="start.appserver.win"/>
-    </target>
-    <!--
-        Start The App Server on unix/linux
-    -->
-    <target name="start.appserver.unix" depends="configPlatform" if="isUnixPlatform">
-      <exec executable="${exec.asadmin}" failifexecutionfails="false">
-        <arg line="${exec.asadmin.part2}" />
-        <arg line=" --user ${admin.user}"/>
-        <arg line=" --passwordfile ${password.file}"/>
-        <arg line=" start-domain"/>
-        <arg line=" ${server.domain.name}"/>
-      </exec>
-      <echo message=" The App Server is now available." />
-    </target>
-
-    <!--
-        Start the App Server on windoze
-    -->
-    <target name="start.appserver.win" depends="configPlatform" if="isWindowsPlatform">
-      <spawn executable="${exec.asadmin}" failifexecutionfails="false">
-        <arg line="${exec.asadmin.part2}" />
-        <arg line=" --user ${admin.user}"/>
-        <arg line=" --passwordfile ${password.file}"/>
-        <arg line=" start-domain"/>
-        <arg line=" ${server.domain.name}"/>
-      </spawn>
-      <echo message=" ...Waiting for server to be up ...(sleeping for ${server.start.delay.mins} minutes) " /> 
-      <!-- 
-        Currently the waitfor task allocates a port everytime it checks the admin server URL.
-        If one of the server ports is allocated to the waitfor task we get a server startup error.
-        Asadmin start-domain is a synchronous call but in the case of ant on windows the asadmin
-        start-domain never returns to the ant exec task so it hangs forever.  For now we simply
-        sleep for server.start.delay.mins minutes to give the app server more than enough time to come up.  This is
-        a temparay fix until we implement something better.
-      -->
-      <sleep minutes="${server.start.delay.mins}"/> 
-      <echo message=" HTTP server is now available at http://${server.host}:${server.port}" />
-    </target>
-
-    <!--
-       Create cts-asadmin.bat for the harness:
-       Appends an echo statement to the asadmin.bat file on windows only.
-       This is done so the CTS porting can read the return status of
-       the exec'ed asadmin command.  On Unix the return value is propogated
-       back to the exec'ed process.
-    -->
-    <target name="create.asadmin.bat" depends="configPlatform,checkForFiles" if="isWindowsPlatform">
-        <concat destfile="${server.home}/bin/cts-asadmin.bat">
-           <filelist dir="${server.home}/bin" files="asadmin.bat" />
-           <filelist dir="${bin.dir}/xml/impl/glassfish/templates" files="asadmin.bat.concat.template" />
-        </concat>
-    </target>
-
-    <!--
-        Stop The App Server
-    -->
-    <target name="stop-domain" depends="configPlatform">
-      <exec executable="${exec.asadmin}" failifexecutionfails="false">
-        <arg line="${exec.asadmin.part2}" />
-        <arg line=" stop-domain"/>
-        <arg line=" ${server.domain.name}"/>
-      </exec>
-    </target>
-
-     <!--
-       list.jdbc.pools provides the names of the configured jdbc pools.
-     -->
-     <target name="list.jdbc.pools" depends="configPlatform">
-        <exec executable="${exec.asadmin}" >
-            <arg line="${exec.asadmin.part2}" />
-            <arg line=" --user ${admin.user}"/>
-            <arg line=" --passwordfile ${password.file}"/>
-            <arg line=" --host ${server.host}"/>
-            <arg line=" --port ${server.port}"/>
-            <arg line=" list-jdbc-connection-pools"/>
-        </exec>
-     </target>
-
-     <!--
-      create-jdbc-connection-pool configures the connection pools defined in the
-      build.properties files.
-     -->
-     <target name="create-jdbc-connection-pool">
-        <exec executable="${exec.asadmin}" >
-            <arg line="${exec.asadmin.part2}" />
-            <arg line=" --user ${admin.user}"/>
-            <arg line=" --passwordfile ${password.file}"/>
-            <arg line=" --host ${server.host}"/>
-            <arg line=" --port ${server.port}"/>
-            <arg line=" create-jdbc-connection-pool"/>
-            <arg line=" --restype ${restype}"/>
-            <arg line=" --datasourceclassname ${datasourceclassname}"/>
-            <arg line=" --steadypoolsize ${use.jdbc.steadypoolsize}"/>
-            <arg line=" --maxpoolsize ${use.jdbc.maxpoolsize}"/>
-            <arg line=" --property ${pool.properties}"/>
-            <arg line=" ${poolName}"/>
-        </exec>
-     </target>
-
-     <!--
-        delete-jdbc-connection-pool removes the connection pools defined in the
-        build.properties files.
-     -->
-     <target name="delete-jdbc-connection-pool">
-        <exec executable="${exec.asadmin}" >
-            <arg line="${exec.asadmin.part2}" />
-            <arg line=" --user ${admin.user}"/>
-            <arg line=" --passwordfile ${password.file}"/>
-            <arg line=" --host ${server.host}"/>
-            <arg line=" --port ${server.port}"/>
-            <arg line=" delete-jdbc-connection-pool"/>
-            <arg line=" ${poolName}"/>
-        </exec>
-     </target>
-
-     <target name="ping.jdbc.pool.check" depends="configPlatform, checkIfUsingDerbyPool"
-             unless="usingDerbyPool">
-
-        <antcall target="ping.jdbc.pool"/>
-     </target>
-     <!-- 
-       ping.jdbc.pool validates that that configured JDBC Connection Pool
-       can be accessed.
-
-     -->
-     <target name="ping.jdbc.pool" depends="configPlatform">
-        <echo message= "****Validating Connection pool: ${use.jdbc.poolName} ***"/>
-        <echo message= ""/>
-        <echo message= "Note: this will fail if your DB server is not started"/>
-        <echo message= "      and you can just start your DB server"/>
-        <echo message= ""/>
-        <antcall target="ping-connection-pool" >
-          <param name="poolName" value="${use.jdbc.poolName}" />
-        </antcall>
-     </target>
-   
-     <!--
-        ping-connection-pool removes the connection pools defined in the
-        build.properties files.
-     -->
-     <target name="ping-connection-pool">
-        <exec executable="${exec.asadmin}" >
-            <arg line="${exec.asadmin.part2}" />
-            <arg line=" --user ${admin.user}"/>
-            <arg line=" --passwordfile ${password.file}"/>
-            <arg line=" --host ${server.host}"/>
-            <arg line=" --port ${server.port}"/>
-            <arg line=" ping-connection-pool"/>
-            <arg line=" ${poolName}"/>
-        </exec>
-     </target>
-     <!--
-       Create a JDBC JNDI resource using an existing Connection pool
-     -->
-     <target name="create-jdbc-resource">
-        <exec executable="${exec.asadmin}" >
-            <arg line="${exec.asadmin.part2}" />
-            <arg line=" --user ${admin.user}"/>
-            <arg line=" --passwordfile ${password.file}"/>
-            <arg line=" --host ${server.host}"/>
-            <arg line=" --port ${server.port}"/>
-            <arg line=" create-jdbc-resource"/>
-            <arg line=" --connectionpoolid ${connectionpoolid}"/>
-            <arg line=" ${jndiName}"/>
-        </exec>
-     </target>
-
-     <!--
-        Delete an existing JDBC JNDI resource
-     -->
-     <target name="delete-jdbc-resource">
-        <exec executable="${exec.asadmin}" >
-            <arg line="${exec.asadmin.part2}" />
-            <arg line=" --user ${admin.user}"/>
-            <arg line=" --passwordfile ${password.file}"/>
-            <arg line=" --host ${server.host}"/>
-            <arg line=" --port ${server.port}"/>
-            <arg line=" delete-jdbc-resource"/>
-            <arg line=" ${jndiName}"/>
-        </exec>
-     </target>
-
-     
-     <!--
-         Add a jvm option to the server
-     -->
-   <target name="create-jvm-options" depends="delete-jvm-options">
-        <exec executable="${exec.asadmin}" >
-            <arg line="${exec.asadmin.part2}" />
-            <arg line=" --user ${admin.user}"/>
-            <arg line=" --passwordfile ${password.file}"/>
-            <arg line=" --host ${server.host}"/>
-            <arg line=" --port ${server.port}"/>
-            <arg line=" create-jvm-options "/>
-            <arg line=" ${jvm.options}"/>
-        </exec>
-     </target>
-
-
-
-     <!--
-         Remove a jvm option that was prevously added
-     -->
-     <target name="delete-jvm-options">
-        <exec executable="${exec.asadmin}" >
-            <arg line="${exec.asadmin.part2}" />
-            <arg line=" --user ${admin.user}"/>
-            <arg line=" --passwordfile ${password.file}"/>
-            <arg line=" --host ${server.host}"/>
-            <arg line=" --port ${server.port}"/>
-            <arg line=" delete-jvm-options "/>
-            <arg line=" ${jvm.options}"/>
-        </exec>
-     </target>
-
-
-     <!--
-         this is best used for the case where we want to delete a single
-         JVM option that happens to contain a file or path.  The reason for
-         using this over the 'create-jvm-options' target is that this is 
-         designed to better handle paths on Windows platform where
-         the paths may contain a colon (":") character.  The colon char 
-         requires special escape char handling in (GF) asadmin command.
-         Bottom line - use this for creating a JVM option that contains
-         a file/dir path AND use its counterpart for deleting that same
-         JVM option.  (the counterpart is 'delete-one-jvm-option')
-      -->
-     <target name="create-one-jvm-option" depends="checkPlatform,delete-one-jvm-option">
-        <if> <or>
-                 <istrue value="isWindowsPlatform"/>
-                 <os family="windows"/>
-                 <os family="dos"/>
-             </or>
-           <then>
-               <propertyregex property="the.jvm.option"
-                        input="${jvm.options}"
-                        regexp=":"
-                        replace="\\\\:"
-                        defaultvalue="${jvm.options}"
-                        override="true"/>
-           </then>
-           <else>
-                 <property  name="the.jvm.option"  value="${jvm.options}"/>
-           </else>
-        </if>
- 
-
-        <exec executable="${exec.asadmin}" >
-            <arg line="${exec.asadmin.part2}" />
-            <arg line=" --user ${admin.user}"/>
-            <arg line=" --passwordfile ${password.file}"/>
-            <arg line=" --host ${server.host}"/>
-            <arg line=" --port ${server.port}"/>
-            <arg line=" create-jvm-options "/>
-            <arg line=" ${the.jvm.option}"/>
-        </exec>
-     </target>
-
-
-     <target name="delete-one-jvm-option" depends="checkPlatform">
-        <if> <or>
-                 <istrue value="isWindowsPlatform"/>
-                 <os family="windows"/>
-                 <os family="dos"/>
-             </or>
-           <then>
-               <propertyregex property="the.jvm.option"
-                        input="${jvm.options}"
-                        regexp=":"
-                        replace="\\\\:"
-                        defaultvalue="${jvm.options}"
-                        override="true"/>
-           </then>
-           <else>
-                 <property  name="the.jvm.option"  value="${jvm.options}"/>
-           </else>
-        </if>
-
-        <exec executable="${exec.asadmin}" >
-            <arg line="${exec.asadmin.part2}" />
-            <arg line=" --user ${admin.user}"/>
-            <arg line=" --passwordfile ${password.file}"/>
-            <arg line=" --host ${server.host}"/>
-            <arg line=" --port ${server.port}"/>
-            <arg line=" delete-jvm-options "/>
-            <arg line=" ${the.jvm.option}"/>
-        </exec>
-     </target>
-
-
-     <!--
-        Set an attribute for an existing domain element
-     -->
-     <target name="set" >
-        <exec executable="${exec.asadmin}" >
-            <arg line="${exec.asadmin.part2}" />
-            <arg line=" --user ${admin.user}"/>
-            <arg line=" --passwordfile ${password.file}"/>
-            <arg line=" --host ${server.host}"/>
-            <arg line=" --port ${server.port}"/>
-            <arg line=" set"/>
-            <arg line=" ${set.value}"/>
-        </exec>
-     </target>
-
-     <target name="create-file-user" >
-        <!-- filter a template file to $ts.home/tmp for this particular user and pass it to the -->
-        <!-- asadmin command below.  Form of AS_ADMIN_USERPASSWORD=${userpassword} -->
-        <copy file="${password.file.template}"
-              tofile="${password.file}"
-              overwrite="true">
-          <filterset>
-            <filter token="sjsas.master.password" value="${sjsas.master.password}"/>
-            <filter token="sjsas.admin.password" value="${admin.password}"/>
-            <filter token="user.password" value="${userpassword}" />
-          </filterset>
-        </copy>
-        <exec executable="${exec.asadmin}" >
-            <arg line="${exec.asadmin.part2}" />
-            <arg line=" --user ${admin.user}"/>
-            <arg line=" --passwordfile ${password.file}"/>
-            <arg line=" --host ${server.host}"/>
-            <arg line=" --port ${server.port}"/>
-            <arg line=" create-file-user"/>
-            <arg line=" --groups ${usergroups}"/>
-            <arg line=" ${userName}"/>
-        </exec>
-     </target>
-
-     <target name="delete-file-user" >
-        <exec executable="${exec.asadmin}" >
-            <arg line="${exec.asadmin.part2}" />
-            <arg line=" --user ${admin.user}"/>
-            <arg line=" --passwordfile ${password.file}"/>
-            <arg line=" --host ${server.host}"/>
-            <arg line=" --port ${server.port}"/>
-            <arg line=" delete-file-user"/>
-            <arg line=" ${userName}"/>
-        </exec>
-     </target>
-
-     <!--
-       Remove the mail JNDI resources
-     -->
-     <target name="delete-mail-resource">
-        <exec executable="${exec.asadmin}" >
-            <arg line="${exec.asadmin.part2}" />
-            <arg line=" --user ${admin.user}"/>
-            <arg line=" --passwordfile ${password.file}"/>
-            <arg line=" --host ${server.host}"/>
-            <arg line=" --port ${server.port}"/>
-            <arg line=" delete-mail-resource"/>
-            <arg line=" ${jndiName}"/>
-        </exec>
-     </target>
-
-     <!--
-       Add the mail JNDI resources
-     -->
-     <target name="create-mail-resource" >
-        <exec executable="${exec.asadmin}" >
-            <arg line="${exec.asadmin.part2}" />
-            <arg line=" --user ${admin.user}"/>
-            <arg line=" --passwordfile ${password.file}"/>
-            <arg line=" --host ${server.host}"/>
-            <arg line=" --port ${server.port}"/>
-            <arg line=" create-mail-resource"/>
-            <arg line=" --mailhost ${mailHost}"/>
-            <arg line=" --mailuser ${mailuser1}"/>
-            <arg line=" --fromaddress ${mailFrom}"/>
-            <arg line=" --property mail.smtp.port=${smtp.port}"/>
-            <arg line=" ${jndiName}"/>
-        </exec>
-     </target>
-
-     <!--
-        Add the a JMS user
-     -->
-     <target name="create-jms-user" >
-       <exec executable="${exec.imqusermgr}" >
-            <env key="IMQ_JAVAHOME" value="${java.home}"/>
-            <arg line="${exec.imqusermgr.part2}"/>
-            <arg line="-i ${jmsServer}"/>
-            <arg line=" add"/>
-            <arg line=" -u ${userName} "/>
-            <arg line=" -p ${userPassword} "/>
-            <arg line=" -g ${userGroup} "/>
-            <arg line=" -f "/>
-            <arg line=" -c "/>
-        </exec>
-     </target>
-
-     <!--
-        Delete the a JMS user
-     -->
-     <target name="delete-jms-user" >
-       <exec executable="${exec.imqusermgr}" >
-            <env key="IMQ_JAVAHOME" value="${java.home}"/>
-            <arg line="${exec.imqusermgr.part2}"/>
-            <arg line="-i ${jmsServer}"/>
-            <arg line=" delete"/>
-            <arg line=" -u ${userName} "/>
-            <arg line=" -p ${userPassword} "/>
-            <arg line=" -g ${userGroup} "/>
-            <arg line=" -f "/>
-        </exec>
-     </target>
-
-     <!--
-       Delete a Connector Connection Pool
-     -->
-     <target name="delete-connector-connection-pool" >
-        <exec executable="${exec.asadmin}" >
-            <arg line="${exec.asadmin.part2}" />
-            <arg line=" --user ${admin.user}"/>
-            <arg line=" --passwordfile ${password.file}"/>
-            <arg line=" --host ${server.host}"/>
-            <arg line=" --port ${server.port}"/>
-            <arg line=" delete-connector-connection-pool"/>
-            <arg line=" --cascade=true"/>
-            <arg line=" ${poolName}"/>
-        </exec>
-    </target>
-
-     <!--
-       Create a Connector Resource
-     -->
-     <target name="create-connector-resource" >
-        <exec executable="${exec.asadmin}" >
-            <arg line="${exec.asadmin.part2}" />
-            <arg line=" --user ${admin.user}"/>
-            <arg line=" --passwordfile ${password.file}"/>
-            <arg line=" --host ${server.host}"/>
-            <arg line=" --port ${server.port}"/>
-            <arg line=" create-connector-resource"/>
-            <arg line=" --poolname ${poolName}"/>
-            <arg line=" ${jndiName}"/>
-        </exec>
-     </target>
-
-
-     <!--
-       Delete a Connector Resource
-     -->
-     <target name="delete-connector-resource" >
-        <exec executable="${exec.asadmin}" >
-            <arg line="${exec.asadmin.part2}" />
-            <arg line=" --user ${admin.user}"/>
-            <arg line=" --passwordfile ${password.file}"/>
-            <arg line=" --host ${server.host}"/>
-            <arg line=" --port ${server.port}"/>
-            <arg line=" delete-connector-resource"/>
-            <arg line=" ${jndiName}"/>
-        </exec>
-     </target>
-
-
-     <!--
-       SSL config stuff for CSIv2 interop tests
-     -->
-     <target name="add.ssl.client.config" depends="configPlatform" unless="use.create.system.properties">
-        <exec executable="${exec.asadmin}" >
-            <arg line="${exec.asadmin.part2}" />
-            <arg line=" --user ${admin.user}"/>
-            <arg line=" --passwordfile ${password.file}"/>
-            <arg line=" --host ${server.host}"/>
-            <arg line=" --port ${server.port}"/>
-            <arg line=" create-ssl"/>
-            <arg line=" --type iiop-service"/>
-            <arg line=" --certname s1as"/>
-        </exec>
-     </target>
-     <target name="drop.ssl.client.config" depends="configPlatform" unless="use.create.system.properties">
-        <exec executable="${exec.asadmin}" >
-            <arg line="${exec.asadmin.part2}" />
-            <arg line=" --user ${admin.user}"/>
-            <arg line=" --passwordfile ${password.file}"/>
-            <arg line=" --host ${server.host}"/>
-            <arg line=" --port ${server.port}"/>
-            <arg line=" delete-ssl"/>
-            <arg line=" --type iiop-service"/>
-        </exec>
-     </target>
-
-      <!--
-       drop.classpathsuffix removes the classpath settings previously defined
-     -->
-     <target name="drop.classpathsuffix" depends="configPlatform" >
-         <antcall target="set" >
-          <param name="set.value" value=" ${server.instance}-config.java-config.classpath_suffix="/>
-         </antcall>
-     </target>
-
-
-    <!--
-       rerestart.server reconfigures and restarts the App Server
-     -->
-     <target name="restart.server" depends="configPlatform">
-       <antcall target="stop-domain"/>
-       <delete quiet="true">
-         <fileset dir="${s1as.domain}/logs" includes="jacc_log*"/>
-       </delete>
-       <antcall target="start.appserver"/>
-     </target>
-
-
-     <!--
-       Modify the applicationRoot. Needed for windows tests.
-     -->
-     <target name="change.applicationRoot" depends="configPlatform" if="isWindowsPlatform">
-         <antcall target="set" >
-          <param name="set.value" value=" domain.application_root=${drive}"/>
-         </antcall>
-         <antcall target="restart.server"/>
-     </target>
-
-     <!--
-       Enable Tx interoperability
-     -->
-     <target name="enable.tx.interop" depends="configPlatform" >
-       <antcall target="delete.tx.interop"/>
-       <antcall target="create-jvm-options" >
-         <param name="jvm.options" value=" -Dcom.sun.jts.pi.INTEROP_MODE=true"/>
-       </antcall>
-       <antcall target="restart.server"/>
-     </target>
-
-     <!--
-       Disable Tx interoperability
-     -->
-     <target name="disable.tx.interop" depends="configPlatform" >
-       <antcall target="delete.tx.interop"/>
-       <antcall target="create-jvm-options" >
-         <param name="jvm.options" value=" -Dcom.sun.jts.pi.INTEROP_MODE=false"/>
-       </antcall>
-       <antcall target="restart.server"/>
-     </target>
-
-     <!--
-       Delete the Tx interoperability settings
-     -->
-     <target name="delete.tx.interop" depends="configPlatform" >
-       <antcall target="delete-jvm-options" >
-         <param name="jvm.options" value=" -Dcom.sun.jts.pi.INTEROP_MODE=true"/>
-       </antcall>
-
-       <antcall target="delete-jvm-options" >
-         <param name="jvm.options" value=" -Dcom.sun.jts.pi.INTEROP_MODE=false"/>
-       </antcall>
-     </target>
-
-     <!--
-       Add the certificate needed for csiv2
-     -->
-     <target name="import.cert" depends="configPlatform,checkForFiles,generate.certs" >
-        <exec executable="${exec.keytool}" >
-            <env key="JAVA_HOME" value="${java.home}" />
-            <arg line=" ${exec.keytool.part2}" />
-            <arg line=" -import"/>
-			<arg line=" -keyalg DSA"/>
-            <arg line=" -alias ${cert.alias}"/>
-            <arg line=" -file ${cert.file}"/>
-            <arg line=" -noprompt"/>
-            <arg line=" -trustcacerts"/>
-            <arg line=" -keystore ${trustStore}"/>
-            <arg line=" -storepass ${trustStore.password}"/>
-        </exec>
-
-     </target>
-
-
-     <target name="export.cert" depends="configPlatform,checkForFiles,generate.certs" >
-        <exec executable="${exec.keytool}" >
-            <env key="JAVA_HOME" value="${java.home}" />
-            <arg line=" ${exec.keytool.part2}" />
-            <arg line=" -export"/>
-			<arg line=" -keyalg DSA"/>
-            <arg line=" -rfc"/>
-            <arg line=" -alias ${cert.alias}"/>
-            <arg line=" -file ${cert.file}"/>
-            <arg line=" -keystore ${trustStore}"/>
-            <arg line=" -storepass ${trustStore.password}"/>
-        </exec>
-
-     </target>
-
-
-     <!--
-       Drop the certificate used for csiv2
-     -->
-     <target name="delete.cert" depends="configPlatform" >
-        <exec executable="${exec.keytool}" >
-            <env key="JAVA_HOME" value="${java.home}" />
-            <arg line=" ${exec.keytool.part2}" />
-            <arg line=" -delete"/>
-            <arg line=" -alias ${cert.alias}"/>
-            <arg line=" -file ${cert.file}"/>
-            <arg line=" -storepass ${trustStore.password}"/>
-            <arg line=" -noprompt"/>
-            <arg line=" -trustcacerts"/>
-            <arg line=" -keystore ${trustStore}"/>
-        </exec>
-     </target>
-
-
-     <!--
-       This target is only used for SE/EE it generates the jks files from the 
-       NSS database.  This is needed by appclient on SE/EE.
-     -->
-     <target name="generate.certs"  unless="java.keystore.generated" >
-        <echo message="***Exporting certificate from NSS database" />
-        <exec executable="${exec.certutil}" 
-              output="${server.config.dir.path}/${server.cert.alias}.cert" >
-            <env key="JAVA_HOME" value="${java.home}" />
-            <arg line=" ${exec.certutil.part2}" />
-            <arg line=" -L" />
-            <arg line=" -n" />
-            <arg line=" ${server.cert.alias}" />
-            <arg line=" -d" />
-            <arg line=" ${server.config.dir.path}" />
-            <arg line=" -a" />
-        </exec>
-
-        <echo message="***Generating Java Keystore from generated certificate "/>
-        <exec executable="${exec.keytool}" >
-            <env key="JAVA_HOME" value="${java.home}" />
-            <arg line=" ${exec.keytool.part2}" />
-            <arg line=" -import" />
-            <arg line=" -v" />
-            <arg line=" -noprompt" />
-            <arg line=" -alias ${server.cert.alias}" />
-            <arg line=" -file" />
-            <arg line="${server.config.dir.path}/${server.cert.alias}.cert" />
-            <arg line=" -keypass   ${keystore.password}" />
-            <arg line=" -keystore  ${keystore.jks}" />
-            <arg line=" -storepass ${keystore.password}" />
-        </exec>
-
-        <echo message="***Generating Java trust store from generated certificate "/>
-        <exec executable="${exec.keytool}" >
-            <env key="JAVA_HOME" value="${java.home}" />
-            <arg line=" ${exec.keytool.part2}" />
-            <arg line=" -import" />
-            <arg line=" -v" />
-            <arg line=" -noprompt" />
-            <arg line=" -trustcacerts" />
-            <arg line=" -alias ${server.cert.alias}" />
-            <arg line=" -file" />
-            <arg line="${server.config.dir.path}/${server.cert.alias}.cert" />
-            <arg line=" -keypass   ${keystore.password}" />
-            <arg line=" -keystore  ${cacerts.jks}" />
-            <arg line=" -storepass ${keystore.password}" />
-        </exec>
-     </target>
-
-
-     <!--
-          targets to stop and start Derby
-     
-          It may be necessary to add the following system property to the JavaDB startup when running on the Mac.
-          The bug is suppossed to be fixed, making the property unnecessary,  but one never knows.
-          This URL describes the issue and the fix:  http://db.apache.org/derby/faq.html#createdb_OS_X
-
-            <sysproperty key="derby.storage.fileSyncTransactionLog" value="true"/>
-     -->
-      <target name="start.javadb" depends="configPlatform">
-        <var name="is.derby.running" unset="true" />
-        <echo message="*** Checking if Derby is running "/>
-        <antcallback target="is.derby.running" return="isDBRunning"/>
-        <if>
-            <isfalse value="${isDBRunning}"/>
-        <then>
-            <echo message="Derby not running, now starting it"/>
-            <java classname="org.apache.derby.drda.NetworkServerControl"
-                  classpath="${use.derby.classpath}" fork="true" spawn="true">
-              <sysproperty key="derby.system.home" value="${use.derby.system.home}"/>
-              <sysproperty key="java.security.manager" value=""/>
-              <sysproperty key="java.security.policy" value="${server.config.dir.path}/server.policy"/>
-              <arg line="-h ${use.derby.server} -p ${use.derby.port} start"/>
-            </java>
-            <sleep seconds="${use.derby.startup.delay}"/>
-            <echo message="*** Now checking if Derby is running "/>
-            <var name="is.derby.running" unset="true" />
-            <antcallback target="is.derby.running" return="isDBRunning"/>
-            <if>
-                <isfalse value="${isDBRunning}"/>
-            <then>
-                <echo message="Derby was NOT started successfully" />
-            </then>
-            <else>
-                <echo message="Derby was started successfully"/>
-            </else>
-            </if>
-        </then>
-        <else>
-            <echo message="Derby is already running"/>
-        </else>
-        </if>
-     </target>
-
-     <target name="stop.javadb" depends="configPlatform">
-         <echo message="*** Stopping JavaDB"/>
-         <java classname="org.apache.derby.drda.NetworkServerControl"
-                 classpath="${use.derby.classpath}" fork="true" spawn="true">
-              <arg line="-h ${use.derby.server} -p ${use.derby.port} shutdown"/>
-         </java>
-     </target>
-
-    <target name="is.derby.running" depends="configPlatform">
-            <!-- check to see if the specified port on the specified server is available -->
-            <waitfor maxwait="5" maxwaitunit="second" checkevery="1" checkeveryunit="second">
-      			<socket server="${use.derby.server}" port="${use.derby.port}"/>
-      		</waitfor>
-      		<if>
-      			<socket server="${use.derby.server}" port="${use.derby.port}"/>
-      			<then>
-                    <!-- check that we can actually get to the DB -->
-                  		<var name="isDBRunning" unset="true"/>
-                  		<var name="db.sql.test.output" unset="true"/>
-                  		<var name="db.sql.test.error" unset="true"/>
-                  		<trycatch property="db.sql.test.output" reference="bar">
-                  			<try>
-                 				<sql classpath="${use.derby.classes}"
-               				   driver="${use.derby.driver}" url="${use.derby.url}"
-               				   userid="${use.derby.user}" password="${use.derby.passwd}"
-               				   errorproperty="derby.sql.test.error" >
-               				   values user;
-                    			</sql>
-                  			</try>
-                  			<catch>
-                  				<var name="isDBRunning" value="false"/>
-                  				<echo message="*** There was a problem connecting to DB at ${use.derby.url}"/>
-                  				<if>
-                  					<isset property="db.sql.test.output"/>
-                  					<then>
-                  						<echo message="Output:${db.sql.test.output}"/>
-                  					</then>
-                  				</if>
-                  				<if>
-                  					<isset property="db.sql.test.error"/>
-                  					<then>
-                  						<echo message="Error:${db.sql.test.error}"/>
-                  					</then>
-                  				</if>
-                  			</catch>
-                  			<finally>
-                  				<if>
-                  					<and>
-                  						<not>
-                                           <or>
-                                               <contains string="${db.sql.test.output}" substring="refused" />
-                                               <contains string="${db.sql.test.output}" substring="Exception" />
-                                           </or>
-                  						</not>
-                  						<not>
-                  							<isset property="db.sql.test.error"/>
-                  						</not>
-                  					</and>
-                  					<then>
-                  						<echo message="*** DB is running and can be connected to."/>
-                  						<var name="isDBRunning" value="true"/>
-                  					</then>
-                  					<else>
-                  						<var name="isDBRunning" value="false"/>
-                  					</else>
-                  				</if>
-                  			</finally>
-                  		</trycatch>
-      			</then>
-      			<else>
-                    <var name="isDBRunning" value="false"/>
-      			</else>
-      		</if>
-     	</target>
-
-
-     <!--
-          Determine whether we are running the Java EE RI, PE, SE or EE
-          edition.
-     -->
-     <target name="get.platform.edition" depends="configPlatform">
-        <exec executable="${exec.asadmin}"  outputproperty="viVersion">
-            <arg line="${exec.asadmin.part2}" />
-            <arg line=" version"/>
-            <arg line=" --user ${s1as.admin.user}"/>
-            <arg line=" --passwordfile ${password.file}"/>
-            <arg line=" --host ${s1as.admin.host}"/>
-            <arg line=" --port ${s1as.admin.port}"/>
-        </exec>
-     
-        <condition  property="foundPE">
-           <or>
-              <contains string="${viVersion}"
-                        substring="Reference Implementation"/>
-              <contains string="${viVersion}"
-                        substring="Platform Edition"/>
-           </or>
-        </condition>
-     </target>
-
-     <!--
-        create-nodeagent
-     -->
-     <target name="create-nodeagent">
-       <echo message= "****create-nodeagent ${nodeagent.name}"/>
-        <exec executable="${exec.asadmin}" >
-            <arg line="${exec.asadmin.part2}" />
-            <arg line="create-node-agent"/>
-            <arg line="--host ${server.host}"/>
-            <arg line="--port ${server.port}"/>
-            <arg line="--user ${admin.user}"/>
-            <arg line="--passwordfile ${password.file}"/>
-            <arg line="--savemasterpassword"/>
-            <arg line="--passwordfile ${password.file}"/>
-            <arg line="${nodeagent.path}"/>
-            <arg line="${nodeagent.name}"/>
-        </exec>
-     </target>
-
-     <!--
-        create-node-instance
-     -->
-     <target name="create-node-instance">
-       <echo message= "****create-node-instance ${node.instance.name}"/>
-        <exec executable="${exec.asadmin}" >
-            <arg line="${exec.asadmin.part2}" />
-            <arg line="create-instance"/>
-            <arg line="--user ${admin.user}"/>
-            <arg line="--passwordfile ${password.file}"/>
-            <arg line="--host ${server.host}"/>
-            <arg line="--port ${server.port}"/>
-            <arg line="--nodeagent ${nodeagent.name}"/>
-            <arg line=" ${node.instance.name}"/>
-        </exec>
-     </target>
-
-
-     <!--
-        create-cluster-instance
-     -->
-     <target name="create-cluster-instance">
-        <exec executable="${exec.asadmin}" >
-            <arg line="${exec.asadmin.part2}" />
-            <arg line="create-instance"/>
-            <arg line="--user ${admin.user}"/>
-            <arg line="--passwordfile ${password.file}"/>
-            <arg line="--cluster ${cluster.name}"/>
-            <arg line="--nodeagent ${nodeagent.name}"/>
-            <arg line=" ${node.instance.name}"/>
-        </exec>
-     </target>
-
-     <!--
-        start-nodeagent
-     -->
-     <target name="start-nodeagent.win" if="isWindowsPlatform">
-       <echo message= "****start-nodeagent ${nodeagent.name}"/>
-        <spawn executable="${exec.asadmin}" >
-            <arg line="${exec.asadmin.part2}" />
-            <arg line="start-node-agent"/>
-            <arg line="--user ${admin.user}"/>
-            <arg line="--passwordfile ${password.file}"/>
-            <arg line="${nodeagent.path}"/>
-            <arg line="${nodeagent.name}"/>
-        </spawn>
-        <echo message="Sleeping for ${server.start.delay.mins} minutes waiting for node agent to start"/>
-        <sleep minutes="${server.start.delay.mins}"/>
-     </target>
-     <target name="start-nodeagent.unix" if="isUnixPlatform">
-       <echo message= "****start-nodeagent ${nodeagent.name}"/>
-        <exec executable="${exec.asadmin}" >
-            <arg line="${exec.asadmin.part2}" />
-            <arg line="start-node-agent"/>
-            <arg line="--user ${admin.user}"/>
-            <arg line="--passwordfile ${password.file}"/>
-            <arg line="${nodeagent.name}"/>
-        </exec>
-     </target>
-     <target name="start-nodeagent" depends="configPlatform">
-        <antcall target="start-nodeagent.win"/>
-        <antcall target="start-nodeagent.unix"/>
-     </target>
-
-     <!--
-        stop-nodeagent
-     -->
-     <target name="stop-nodeagent">
-       <echo message= "****stop-nodeagent ${nodeagent.name}"/>
-        <exec executable="${exec.asadmin}" >
-            <arg line="${exec.asadmin.part2}" />
-            <arg line="stop-node-agent"/>
-            <arg line="${nodeagent.path}"/>
-            <arg line="${nodeagent.name}"/>
-        </exec>
-     </target>
-
-     <!--
-        delete-nodeagent
-     -->
-     <target name="delete-nodeagent">
-       <echo message= "****delete-nodeagent ${nodeagent.name}"/>
-        <exec executable="${exec.asadmin}" >
-            <arg line="${exec.asadmin.part2}" />
-            <arg line="delete-node-agent"/>
-            <arg line="${nodeagent.path}"/>
-            <arg line="${nodeagent.name}"/>
-        </exec>
-     </target>
-
-     <!--
-        delete-nodeagent-config
-     -->
-     <target name="delete-nodeagent-config">
-       <echo message= "****delete-nodeagent-config ${nodeagent.name}"/>
-        <exec executable="${exec.asadmin}" >
-            <arg line="${exec.asadmin.part2}" />
-            <arg line="delete-node-agent-config"/>
-            <arg line="--user ${admin.user}"/>
-            <arg line="--passwordfile ${password.file}"/>
-            <arg line="--host ${server.host}"/>
-            <arg line="--port ${server.port}"/>
-            <arg line="${nodeagent.name}"/>
-        </exec>
-     </target>
-     <!--
-        create-cluster
-     -->
-     <target name="create-cluster">
-        <exec executable="${exec.asadmin}" >
-            <arg line="${exec.asadmin.part2}" />
-            <arg line="create-cluster"/>
-            <arg line="--user ${admin.user}"/>
-            <arg line="--passwordfile ${password.file}"/>
-            <arg line=" ${cluster.name}"/>
-        </exec>
-     </target>
-
-
-     <!--
-        start-cluster
-     -->
-     <target name="start-cluster.win" if="isWindowsPlatform">
-        <spawn executable="${exec.asadmin}" >
-            <arg line="${exec.asadmin.part2}" />
-            <arg line="start-cluster"/>
-            <arg line="--user ${admin.user}"/>
-            <arg line="--passwordfile ${password.file}"/>
-            <arg line=" ${cluster.name}"/>
-        </spawn>
-       <echo message="Sleeping for ${server.start.delay.mins} minutes waiting for clusterto start"/>
-        <sleep minutes="${server.start.delay.mins}"/>
-     </target>
-     <target name="start-cluster.unix" if="isUnixPlatform">
-        <exec executable="${exec.asadmin}" >
-            <arg line="${exec.asadmin.part2}" />
-            <arg line="start-cluster"/>
-            <arg line="--user ${admin.user}"/>
-            <arg line="--passwordfile ${password.file}"/>
-            <arg line=" ${cluster.name}"/>
-        </exec>
-     </target>
-     <target name="start-cluster" depends="configPlatform">
-       <antcall target="start-cluster.win"/>
-       <antcall target="start-cluster.unix"/>
-     </target>
-
-
-     <!--
-        start-instance
-     -->
-     <target name="start-instance.win" if="isWindowsPlatform">
-        <spawn executable="${exec.asadmin}" >
-            <arg line="${exec.asadmin.part2}" />
-            <arg line="start-instance"/>
-            <arg line="--user ${admin.user}"/>
-            <arg line="--passwordfile ${password.file}"/>
-            <arg line="--host ${server.host}"/>
-            <arg line="--port ${server.port}"/>
-            <arg line=" ${instance.name}"/>
-        </spawn>
-        <echo message="Sleeping for ${server.start.delay.mins} minutes waiting for remote instance to start"/>
-        <sleep minutes="${server.start.delay.mins}"/>
-     </target>
-     <target name="start-instance.unix" if="isUnixPlatform">
-        <exec executable="${exec.asadmin}" >
-            <arg line="${exec.asadmin.part2}" />
-            <arg line="start-instance"/>
-            <arg line="--user ${admin.user}"/>
-            <arg line="--passwordfile ${password.file}"/>
-            <arg line="--host ${server.host}"/>
-            <arg line="--port ${server.port}"/>
-            <arg line=" ${instance.name}"/>
-        </exec>
-     </target>
-     <target name="start-instance" depends="configPlatform">
-       <antcall target="start-instance.win"/>
-       <antcall target="start-instance.unix"/>
-     </target>
-
-     <!--
-        stop-instance
-     -->
-     <target name="stop-instance" depends="configPlatform">
-        <exec executable="${exec.asadmin}" >
-            <arg line="${exec.asadmin.part2}" />
-            <arg line="stop-instance"/>
-            <arg line="--user ${admin.user}"/>
-            <arg line="--passwordfile ${password.file}"/>
-            <arg line="--host ${server.host}"/>
-            <arg line="--port ${server.port}"/>
-            <arg line=" ${instance.name}"/>
-        </exec> 
-        <echo message="Sleeping for ${server.start.delay.mins} minutes waiting for instance to stop"/>
-        <sleep minutes="${server.start.delay.mins}"/>       
-     </target>
-
-     <!--
-        delete-instance
-     -->
-     <target name="delete-instance">
-        <exec executable="${exec.asadmin}" >
-            <arg line="${exec.asadmin.part2}" />
-            <arg line="delete-instance"/>
-            <arg line="--user ${admin.user}"/>
-            <arg line="--passwordfile ${password.file}"/>
-            <arg line="--host ${server.host}"/>
-            <arg line="--port ${server.port}"/>
-            <arg line=" ${instance.name}"/>
-        </exec>
-     </target>
-
-     <!--
-        create-system-properties
-     -->
-     <target name="create-system-properties" >
-        <exec executable="${exec.asadmin}" >
-            <arg line="${exec.asadmin.part2}" />
-            <arg line="--user ${admin.user}"/>
-            <arg line="--host ${server.host}"/>
-            <arg line="--port ${server.port}"/>
-            <arg line="--passwordfile ${password.file}"/>
-            <arg line="create-system-properties"/>
-            <arg line=" ${property}"/>
-        </exec>
-     </target>
-    
-  <!-- Adding wss security providers to secure SOAP messages -->
-
-  <target name="enable.wss.providers"  >
-      <!-- Add default server provider -->
-     <echo message="Adding default server provider" />
-        <antcall target="enable.server.provider">
-        </antcall>
-
-      <!-- Add default server side client provider -->
-     <echo message="Adding default server side client provider" />
-        <antcall target="enable.serverside.client.provider">
-        </antcall>
-       
-     <echo message="Coping sun-acc.xml.template to the appserver config directory" />
-     
-     <copy file="${javaee.home}/lib/install/templates/${sun-acc.xml.template}" 
-             tofile="${javaee.home}/lib/install/templates/${sun-acc.xml.template.orig}" overwrite="yes">
-     </copy>
-     
-     <echo message="Coping wss-client-config.xml to the appserver lib directory" />
-     
-     <copy file="${javaee.home}/lib/appclient/wss-client-config.xml" 
-             tofile="${javaee.home}/lib/appclient/wss-client-config.xml.orig" overwrite="yes">
-     </copy>
-  </target>
-
-   <target name="enable.server.provider" >
-           <property name="exec.asadmin" value="${cli.path}" />
-           <property name="exec.asadmin.part2" value="" />
-            <exec executable="${exec.asadmin}" >
-            <arg line="${exec.asadmin.part2}" /> 
-            <arg line=" set "/>
-            <arg line=" server-config.security-service.message-security-config.SOAP.default_provider=ServerProvider"/>
-        </exec>
-     </target>
-
-  <target name="enable.serverside.client.provider" >
-           <property name="exec.asadmin" value="${cli.path}" />
-           <property name="exec.asadmin.part2" value="" />
-        <exec executable="${exec.asadmin}" >
-            <arg line="${exec.asadmin.part2}" />
-            <arg line="set "/>
-            <arg line="server-config.security-service.message-security-config.SOAP.default_client_provider=ClientProvider "/>
-        </exec>
-     </target>
-    
-    <!--
-       Disable wss providers configuration 
-    -->
-   <target name="disable.wss.providers" depends="configPlatform">
-        <property name="exec.asadmin" value="${cli.path}" />
-        <property name="exec.asadmin.part2" value="" />
-        <exec executable="${exec.asadmin}" >
-            <arg line="${exec.asadmin.part2}" />
-            <arg line="set "/>
-            <arg line=" server-config.security-service.message-security-config.SOAP.default_provider="/>
-        </exec>
-     <echo message="Removing wss client-provider" />
-        <property name="exec.asadmin" value="${cli.path}" />
-        <property name="exec.asadmin.part2" value="" />
-        <exec executable="${exec.asadmin}" >
-            <arg line="${exec.asadmin.part2}" />
-            <arg line="set "/>
-            <arg line="server-config.security-service.message-security-config.SOAP.default_client_provider="/>
-        </exec> 
-    
-    <echo message="Reverting to default sun-acc.xml" />
-    
-    <copy file="${javaee.home}/lib/install/templates/${sun-acc.xml.template.orig}" 
-             tofile="${javaee.home}/lib/install/templates/${sun-acc.xml.template}" overwrite="yes">
-     </copy>
-     
-     <echo message="Coping wss-client-config.xml to the appserver lib directory" />
-     
-     <copy file="${javaee.home}/lib/appclient/wss-client-config.xml.orig" 
-             tofile="${javaee.home}/lib/appclient/wss-client-config.xml" overwrite="yes">
-     </copy>
-
-      <!-- Restart server -->
-        <antcall target="restart.server" />
-   </target>
-
-
-    <!--
-        config the required jvm options for the JPA tests
-    -->
-    <target name="create.jpa.vm.options" depends="configPlatform">
-         <antcall target="create-one-jvm-option" >
-          <param name="jvm.options" value=" -Dlog.file.location=${log.file.location}"/>
-         </antcall>
-    </target>
-
-   <target name="delete.jpa.vm.options" depends="configPlatform">
-         <antcall target="delete-one-jvm-option" >
-          <param name="jvm.options" value=" -Dlog.file.location=${log.file.location}"/>
-         </antcall>
-   </target>
-
-
-     <!--
-         Get the platform version and store the return value in
-         the property "platformVersion".  Currently this method is only
-         required by the target start.appserver
-     -->
-     <target name="get.platform.version" depends="configPlatform" unless="gotVersion">
-        <exec executable="${exec.asadmin}"  outputproperty="platformVersion">
-            <arg line="${exec.asadmin.part2}" />
-            <arg line=" version"/>
-            <arg line=" --user ${admin.user}"/>
-            <arg line=" --passwordfile ${password.file}"/>
-            <arg line=" --host ${server.host}"/>
-            <arg line=" --port ${server.port}"/>
-        </exec>
-
-     </target>
-        
-     <!--
-       Used to create a password file for SJSAS.  Only needed by SJSAS 8.1 but it is
-       compatible
-       -->
-     <target name="filter.password.file" depends="configPlatform">
-       <copy file="${password.file.template}"
-             tofile="${password.file}"
-             overwrite="true"
-             force="true">
-        <filterset>
-           <filter token="sjsas.master.password" value="${sjsas.master.password}"/>
-           <filter token="sjsas.admin.password" value="${admin.password}"/>
-         </filterset>
-       </copy>
-     </target>
-
-     <!--
-         For Appserver EE: Import RI's server certificate into EE's 
-         certificate database using certutil
-     -->
-     <target name="import.into.nss.databases" if="found.nss.databases" >
-          <echo message="Importing RI's server certificate into NSS database" />
-          <exec executable="${exec.certutil}">
-            <env key="JAVA_HOME" value="${java.home}" />
-            <arg line=" ${exec.certutil.part2}" />
-            <arg line=" -A" />
-            <arg line=" -a" />
-            <arg line=" -n" />
-            <arg line=" ricert" />
-            <arg line=" -t" />
-            <arg line=" CTP,CTP,CTP" />
-            <arg line=" -d" />
-            <arg line=" ${NSSConfigDir}" />
-            <arg line=" -i" />
-            <arg line=" ${ts.home}/tmp/ri_server_cert.file" />
-          </exec>
-     </target>
-
-<!-- Please remove if the new version of SE fixes this issue, see start.javadb above for details.
-     <target name="set.fileSyncTransactionLogValue.mac" if="isMac">
-       <property name="fileSyncTransactionLogValue" value="true"/>
-     </target>
-
-     <target name="set.fileSyncTransactionLogValue.non.mac" unless="isMac">
-       <property name="fileSyncTransactionLogValue" value="false"/>       
-     </target>
--->
-
-
-	<!-- 
-	     GF V3.1.2 build 14 now requires an admin password be set before the
-	     domain is started.  This target sets the admin password to the value
-	     defined in the ts.jte.  The s1as.admin.passwd property for the VI and
-	     ri.admin.passwd for the RI.  Eventually this target will be called by
-	     config.vi but for now users will need to invoke this target
-	     manually.  There are just too many different versions of GF under test
-	     and we don't want to be in the business of parsing GF version strings
-	     and ending up with giant if/else blocks everywhere.  When there is an
-	     official 3.1.2 RI available, this target can also be called from
-	     config.ri (if necessary).
-	     
-	     The current.admin.password can be used to specify an existing password
-	     other than the empty string.  Useful if users find a reason to call
-	     this target after a non-empty string password has been set (seems like
-	     a rare use case).  The default value is the empty string since that is
-	     the out-of-the-box admin password.
-	-->
-	<property name="current.admin.password" value=""/>
-	<target name="change.admin.password" depends="configPlatform">
-        <echo>******* BEGIN. CHANGE ADMIN PASSWORD ********</echo>
-		<property name="temp.pass.file" value="${ts.home}/tmp/change-admin-password.txt"/>
-        <delete file="${temp.pass.file}" quiet="true"/>
-        <echo file="${temp.pass.file}">AS_ADMIN_PASSWORD=${current.admin.password}
-AS_ADMIN_NEWPASSWORD=${admin.password}</echo>
-        <exec executable="${exec.asadmin}">
-          <arg line="${exec.asadmin.part2}" />
-          <arg line=" --user ${admin.user}"/>
-          <arg line=" --passwordfile ${temp.pass.file}"/>
-          <arg line=" change-admin-password"/>
-          <arg line=" --domain_name"/>
-          <arg line=" ${server.domain.name}"/>
-        </exec>
-        <loadfile srcFile="${temp.pass.file}" property="password.contents"/>
-        <echo>Contents of ${temp.pass.file}:</echo>
-        <echo>${password.contents}</echo>
-        <delete file="${temp.pass.file}"/>
-        <echo>******* DONE. CHANGE ADMIN PASSWORD ********</echo>
-	</target>
-	
-	
-	<!--
-	  Adding a target to enable secure administration.  This needs to be done
-	  for cases where we wish to manage a remote machine.  As an example,
-	  deploying from the VI to the RI requires that remote administration be
-	  enabled on the RI.  This target will eventually be tied to the config.ri
-	  target (when a new GF 3.1.2 RI is released).  It looks like this target
-	  may never be applicable to the VI but it is located here in common.xml
-	  in case it is ever needed on the VI side.
-	  
-	  If/when this target is called from config.ri, remove the
-	  filter.password.file dependency since this happens prior to this target
-	  being invoked (in javaee_ri.xml=>config.ri).
-	  
-	  This is not a local command so the domain must be running to execute
-	  this command.  The admin password will also have to be set to a non-empty
-	  string before running this command (use change.admin.password target).
-	  To run this command stand alone, you must call filter.password.file as a
-	  precondition.  Remove this paragraph once this target is called from
-	  config.ri since all these issues are handled there.
-	  
-	  To invoke stand-alone (until it is added to config.ri):
-	    ant -f TS_HOME/install/jakartaee/bin/xml/impl/glassfish/javaee_ri.xml \
-	        enable.secure.admin
-	-->
-	<target name="enable.secure.admin" depends="filter.password.file, configPlatform">
-        <echo>******* BEGIN. ENABLE SECURE ADMIN ********</echo>
-        <exec executable="${exec.asadmin}">
-          <arg line="${exec.asadmin.part2}" />
-          <arg line=" --user ${admin.user}"/>
-          <arg line=" --passwordfile ${password.file}"/>
-          <arg line=" --host ${server.host}"/>
-          <arg line=" --port ${server.port}"/>
-          <arg line=" enable-secure-admin"/>
-        </exec>
-        <echo>******* DONE. ENABLE SECURE ADMIN ********</echo>
-    </target>
-	
-    <!--
-      get.client.stubs retrieves the application JAR files needed to launch the application client..
-    -->
-    <target name="get.client.stubs" depends="configPlatform">
-       <exec executable="${exec.asadmin}" >
-           <arg line="${exec.asadmin.part2}" />
-           <arg line=" --user ${admin.user}"/>
-           <arg line=" --passwordfile ${password.file}"/>
-           <arg line=" --host ${server.host}"/>
-           <arg line=" --port ${server.port}"/>
-           <arg line=" get-client-stubs"/>
-           <arg line=" --appName ${deploy.app.name}"/>
-           <arg line=" ${get.stub.clients.ts_dep}"/>
-       </exec>
-    </target>   	
-	
-</project>
diff --git a/bin/xml/impl/glassfish/connector.xml b/bin/xml/impl/glassfish/connector.xml
deleted file mode 100755
index 5c5983c96d..0000000000
--- a/bin/xml/impl/glassfish/connector.xml
+++ /dev/null
@@ -1,573 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
-    Copyright (c) 2018, 2020 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
-
--->
-
-<!--
-  **   This contains connector related build targets that are needed
-  **   to configure the AppServer for connector tests.  These targets
-  **   should be called as part of the config.vi process.
-  -->
-
-<project name="CTS Connector RI configuration" basedir="." default="usage">
-
-    <!-- IMPORTS -->
-    <import file="./common.xml"/>
-    <import file="./deploy.xml"/>
-
-    <property name="deploy.dir" value="${impl.vi.deploy.dir}/"/>
-
-
-    <target name="configPlatform"
-            depends="checkPlatform, configUnix, configWindows">
-    </target>
-
-
-    <!--
-       config.vi configures all of the settings required by connector.
-       Note this does not configure the JMS and security resources.
-    -->
-    <target name="config.connector" depends="configPlatform">
-
-        <!-- 
-            Lets make sure the .rars are built before we deploy them. This
-            step should not be necessary for bundles but it may be necessary
-            when running config.vi from within a new workspace.  We are choosing
-            to look for one .rar and if it exists, we assume all are built.
-         -->
-        <if>
-            <not> <available file="${ts.home}/dist/com/sun/ts/tests/common/connector/whitebox/whitebox-tx.rar"/></not>
-            <then>
-                <ant dir="${ts.home}/src/com/sun/ts/tests/common/connector/whitebox" 
-                     target="build"/>
-            </then>
-        </if>
-
-        <!-- 
-             We must copy whitebox.jar (a shared extension lib) to GF/domains/domain1/lib/applibs 
-             The whitebox.jar will need to be treated as an extension lib such that its classes
-             can be accessed by the rars.  
-         -->
-        <copy file="${ts.home}/dist/com/sun/ts/tests/common/connector/whitebox/whitebox.jar"
-              tofile="${server.domain}/lib/applibs/whitebox.jar"
-              overwrite="yes" />
-
-        <antcall target="restart.server"/>
-
-        <antcall target="create-jvm-options" >
-             <param name="jvm.options" value="${ri.jvm.options}"/>
-        </antcall>
-
-        <antcall target="create.security.eis.mappings" />
-
-        <antcall target="setup.all.rars.and.pools" />
-    </target>
-
-
-    <!-- 
-        .rar based security tests will require a mapping to map eis user
-        names to a username that exists within the connector Server.
-        There should be one mapping for each Resource Adapter.
-        It is sepected each vendor will need its own way of handling 
-        these sort of security mappings of eis users to appserver users.
-    -->
-    <target name="create.security.eis.mappings" depends="configPlatform">
-        <antcall target="create-jvm-options" >
-             <param name="jvm.options" value="-Dwhitebox-tx-map=${rauser1}=${user}:-Dwhitebox-tx-param-map=${rauser1}=${user}:-Dwhitebox-notx-map=${rauser1}=${user}:-Dwhitebox-notx-param-map=${rauser1}=${user}:-Dwhitebox-xa-map=${rauser1}=${user}:-Dwhitebox-xa-param-map=${rauser1}=${user}"/>
-        </antcall>
-    </target>
-
-
-    <target name="deploy.all.rars">
-        <!-- 
-             Due to bug# 6842858, we need to deploy an annotation based .rar before
-             the non-annotation based .rar files.  Failure to do so currently results
-             in a ClassCastException at runtime of the TCK tests.
-        -->
-        <fileset  id="anno_rar_file"
-                  dir="${ts.home}/dist/"
-                  includes="com/sun/ts/tests/common/connector/whitebox/annotated/whitebox-anno_no_md.rar"/>
-        <ts.glassfish.deploy>
-            <fileset refid="anno_rar_file"/>
-        </ts.glassfish.deploy>
-
-        <!--
-            Do not deploy permissiondd.rar in web-profile
-        -->
-        <if>
-          <contains string="${javaee.level}" substring="web"/>
-        <then>
-            <fileset  id="archives"
-                  dir="${ts.home}/dist/"
-                  includes="com/sun/ts/tests/common/connector/whitebox/*.rar,
-                            com/sun/ts/tests/common/connector/whitebox/ibanno/*.rar,  
-                            com/sun/ts/tests/common/connector/whitebox/mdcomplete/*.rar,
-                            com/sun/ts/tests/common/connector/whitebox/mixedmode/*.rar,
-                            com/sun/ts/tests/common/connector/whitebox/multianno/*.rar"/>
-        </then>
-        <else>
-            <fileset  id="archives"
-                  dir="${ts.home}/dist/"
-                  includes="com/sun/ts/tests/common/connector/whitebox/**/*.rar"/>
-       </else>
-       </if>
-
-        <ts.glassfish.deploy>
-            <fileset refid="archives"/>
-        </ts.glassfish.deploy>
-    </target>
-
-    <target name="undeploy.all.rars">
-        <fileset  id="archives"
-                  dir="${impl.vi.deploy.dir}"
-                  includes="*.rar"/>
-
-        <ts.glassfish.undeploy>
-            <fileset refid="archives"/>
-        </ts.glassfish.undeploy>
-    </target>
-
-    <target name="setup.all.rars.and.pools">
-        <antcall target="deploy.all.rars" />
-        <antcall target="create-connection-pools" />
-        <antcall target="create-connection-resources" />
-    </target>
-
-    <target name="undeploy.all.rars.and.pools">
-        <antcall target="delete-connection-resources" />
-        <antcall target="delete-connection-pools" />
-        <antcall target="undeploy.all.rars" />
-    </target>
-
-
-    <target name="create-connection-pools" depends="configPlatform" >
-        <antcall target="create-a-connection-pool" >
-            <param name="rarName" value="whitebox-tx"/>
-            <param name="poolName" value="cts-connector-pool-whitebox-tx.rar"/>
-        </antcall>
-
-        <antcall target="create-a-connection-pool" >
-            <param name="rarName" value="whitebox-tx-param"/>
-            <param name="poolName" value="cts-connector-pool-whitebox-tx-param.rar"/>
-        </antcall>
-
-        <antcall target="create-a-connection-pool" >
-            <param name="rarName" value="whitebox-xa"/>
-            <param name="poolName" value="cts-connector-pool-whitebox-xa.rar"/>
-        </antcall>
-
-        <antcall target="create-a-connection-pool" >
-            <param name="rarName" value="whitebox-xa-param"/>
-            <param name="poolName" value="cts-connector-pool-whitebox-xa-param.rar"/>
-        </antcall>
-
-        <antcall target="create-a-connection-pool" >
-            <param name="rarName" value="whitebox-notx"/>
-            <param name="poolName" value="cts-connector-pool-whitebox-notx.rar"/>
-        </antcall>
-
-        <antcall target="create-a-connection-pool" >
-            <param name="rarName" value="whitebox-notx-param"/>
-            <param name="poolName" value="cts-connector-pool-whitebox-notx-param.rar"/>
-        </antcall>
-
-        <antcall target="create-a-connection-pool" >
-            <param name="rarName" value="whitebox-anno_no_md"/>
-            <param name="poolName" value="cts-connector-pool-whitebox-anno_no_md.rar"/>
-        </antcall>
-
-        <antcall target="create-a-connection-pool" >
-            <param name="rarName" value="whitebox-ibanno_no_md"/>
-            <param name="poolName" value="cts-connector-pool-whitebox-ibanno_no_md.rar"/>
-        </antcall>
-
-        <antcall target="create-a-connection-pool" >
-            <param name="rarName" value="whitebox-mixedmode"/>
-            <param name="poolName" value="cts-connector-pool-whitebox-mixedmode.rar"/>
-        </antcall>
-
-        <antcall target="create-a-connection-pool" >
-            <param name="rarName" value="whitebox-mdcomplete"/>
-            <param name="poolName" value="cts-connector-pool-whitebox-mdcomplete.rar"/>
-        </antcall>
-
-        <antcall target="create-a-connection-pool" >
-            <param name="rarName" value="whitebox-multianno"/>
-            <param name="poolName" value="cts-connector-pool-whitebox-multianno.rar"/>
-        </antcall>
-
-        <antcall target="create-a-connection-pool" >
-            <param name="rarName" value="old-dd-whitebox-tx"/>
-            <param name="connectionFactory" value="com.sun.ts.tests.common.connector.whitebox.TSConnectionFactory"/>
-            <param name="poolName" value="cts-connector-pool-old-dd-whitebox-tx.rar"/>
-        </antcall>
-
-        <antcall target="create-a-connection-pool" >
-            <param name="rarName" value="old-dd-whitebox-xa"/>
-            <param name="connectionFactory" value="com.sun.ts.tests.common.connector.whitebox.TSConnectionFactory"/>
-            <param name="poolName" value="cts-connector-pool-old-dd-whitebox-xa.rar"/>
-        </antcall>
-
-        <antcall target="create-a-connection-pool" >
-            <param name="rarName" value="old-dd-whitebox-notx"/>
-            <param name="connectionFactory" value="com.sun.ts.tests.common.connector.whitebox.TSConnectionFactory"/>
-            <param name="poolName" value="cts-connector-pool-old-dd-whitebox-notx.rar"/>
-        </antcall>
-
-        <antcall target="create-a-connection-pool" >
-            <param name="rarName" value="old-dd-whitebox-notx-param"/>
-            <param name="connectionFactory" value="com.sun.ts.tests.common.connector.whitebox.TSConnectionFactory"/>
-            <param name="poolName" value="cts-connector-pool-old-dd-whitebox-notx-param.rar"/>
-        </antcall>
-
-        <antcall target="create-a-connection-pool" >
-            <param name="rarName" value="old-dd-whitebox-tx-param"/>
-            <param name="connectionFactory" value="com.sun.ts.tests.common.connector.whitebox.TSConnectionFactory"/>
-            <param name="poolName" value="cts-connector-pool-old-dd-whitebox-tx-param.rar"/>
-        </antcall>
-
-        <antcall target="create-a-connection-pool" >
-            <param name="rarName" value="old-dd-whitebox-xa-param"/>
-            <param name="connectionFactory" value="com.sun.ts.tests.common.connector.whitebox.TSConnectionFactory"/>
-            <param name="poolName" value="cts-connector-pool-old-dd-whitebox-xa-param.rar"/>
-        </antcall>
-
-        <if>
-          <contains string="${javaee.level}" substring="web"/>
-        <then>
-            <echo>cts-connector-pool-whitebox-permissiondd connection pool is not created for web profile</echo>
-        </then>
-        <else>
-            <antcall target="create-a-connection-pool" >
-                <param name="rarName" value="whitebox-permissiondd"/>
-                <param name="poolName" value="cts-connector-pool-whitebox-permissiondd.rar"/>
-            </antcall>
-        </else>
-        </if>
-
-    </target>
-
-
-    <target name="delete-connection-pools" depends="configPlatform" >
-        <antcall target="delete-connector-connection-pool" >
-            <param name="poolName" value="cts-connector-pool-whitebox-tx.rar"/>
-        </antcall>
-
-        <antcall target="delete-connector-connection-pool" >
-            <param name="poolName" value="cts-connector-pool-whitebox-tx-param.rar"/>
-        </antcall>
-
-        <antcall target="delete-connector-connection-pool" >
-            <param name="poolName" value="cts-connector-pool-whitebox-xa.rar"/>
-        </antcall>
-
-        <antcall target="delete-connector-connection-pool" >
-            <param name="poolName" value="cts-connector-pool-whitebox-xa-param.rar"/>
-        </antcall>
-
-        <antcall target="delete-connector-connection-pool" >
-            <param name="poolName" value="cts-connector-pool-whitebox-notx.rar"/>
-        </antcall>
-
-        <antcall target="delete-connector-connection-pool" >
-            <param name="poolName" value="cts-connector-pool-whitebox-notx-param.rar"/>
-        </antcall>
-
-        <antcall target="delete-connector-connection-pool" >
-            <param name="poolName" value="cts-connector-pool-whitebox-anno_no_md.rar"/>
-        </antcall>
-
-        <antcall target="delete-connector-connection-pool" >
-            <param name="poolName" value="cts-connector-pool-whitebox-ibanno_no_md.rar"/>
-        </antcall>
-
-        <antcall target="delete-connector-connection-pool" >
-            <param name="poolName" value="cts-connector-pool-whitebox-mixedmode.rar"/>
-        </antcall>
-
-        <antcall target="delete-connector-connection-pool" >
-            <param name="poolName" value="cts-connector-pool-whitebox-mdcomplete.rar"/>
-        </antcall>
-
-        <antcall target="delete-connector-connection-pool" >
-            <param name="poolName" value="cts-connector-pool-whitebox-multianno.rar"/>
-        </antcall>
-
-        <antcall target="delete-connector-connection-pool" >
-            <param name="poolName" value="cts-connector-pool-old-dd-whitebox-tx.rar"/>
-        </antcall>
-
-        <antcall target="delete-connector-connection-pool" >
-            <param name="poolName" value="cts-connector-pool-old-dd-whitebox-xa.rar"/>
-        </antcall>
-
-        <antcall target="delete-connector-connection-pool" >
-            <param name="poolName" value="cts-connector-pool-old-dd-whitebox-notx.rar"/>
-        </antcall>
-
-        <antcall target="delete-connector-connection-pool" >
-            <param name="poolName" value="cts-connector-pool-old-dd-whitebox-tx-param.rar"/>
-        </antcall>
-
-        <antcall target="delete-connector-connection-pool" >
-            <param name="poolName" value="cts-connector-pool-old-dd-whitebox-notx-param.rar"/>
-        </antcall>
-
-        <antcall target="delete-connector-connection-pool" >
-            <param name="poolName" value="cts-connector-pool-old-dd-whitebox-xa-param.rar"/>
-        </antcall>
-
-        <if>
-          <contains string="${javaee.level}" substring="web"/>
-        <then>
-            <echo>cts-connector-pool-whitebox-permissiondd delete is not called for web-profile</echo>
-        </then>
-        <else>
-            <antcall target="delete-connector-connection-pool" >
-                <param name="poolName" value="cts-connector-pool-whitebox-permissiondd.rar"/>
-            </antcall>
-        </else>
-        </if>
-
-    </target>
-
-    <!--
-        AS9.1.1's "asadmin create-connector-resource" command expects the
-        resource name to be in the form of "eis/whitebox-notx-param" and NOT in
-        the form of "java:comp/env/eis/whitebox-notx-param".
-      -->
-    <target name="create-connection-resources" depends="configPlatform" >
-        <antcall target="create-a-connector-resource" >
-            <param name="poolName" value="cts-connector-pool-whitebox-tx.rar"/>
-            <param name="jndiName" value="${whitebox-tx}"/>
-        </antcall>
-
-        <antcall target="create-a-connector-resource" >
-            <param name="poolName" value="cts-connector-pool-whitebox-tx-param.rar"/>
-            <param name="jndiName" value="${whitebox-tx-param}"/>
-        </antcall>
-
-        <antcall target="create-a-connector-resource" >
-            <param name="poolName" value="cts-connector-pool-whitebox-xa.rar"/>
-            <param name="jndiName" value="${whitebox-xa}"/>
-        </antcall>
-
-        <antcall target="create-a-connector-resource" >
-            <param name="poolName" value="cts-connector-pool-whitebox-xa-param.rar"/>
-            <param name="jndiName" value="${whitebox-xa-param}"/>
-        </antcall>
-
-        <antcall target="create-a-connector-resource" >
-            <param name="poolName" value="cts-connector-pool-whitebox-notx.rar"/>
-            <param name="jndiName" value="${whitebox-notx}"/>
-        </antcall>
-
-        <antcall target="create-a-connector-resource" >
-            <param name="poolName" value="cts-connector-pool-whitebox-notx-param.rar"/>
-            <param name="jndiName" value="${whitebox-notx-param}"/>
-        </antcall>
-
-        <antcall target="create-a-connector-resource" >
-            <param name="poolName" value="cts-connector-pool-whitebox-anno_no_md.rar"/>
-            <param name="jndiName" value="${whitebox-anno_no_md}"/>
-        </antcall>
-
-        <antcall target="create-a-connector-resource" >
-            <param name="poolName" value="cts-connector-pool-whitebox-ibanno_no_md.rar"/>
-            <param name="jndiName" value="${whitebox-ibanno_no_md}"/>
-        </antcall>
-
-        <antcall target="create-a-connector-resource" >
-            <param name="poolName" value="cts-connector-pool-whitebox-mixedmode.rar"/>
-            <param name="jndiName" value="${whitebox-mixedmode}"/>
-        </antcall>
-
-        <antcall target="create-a-connector-resource" >
-            <param name="poolName" value="cts-connector-pool-whitebox-mdcomplete.rar"/>
-            <param name="jndiName" value="${whitebox-mdcomplete}"/>
-        </antcall>
-
-        <antcall target="create-a-connector-resource" >
-            <param name="poolName" value="cts-connector-pool-whitebox-multianno.rar"/>
-            <param name="jndiName" value="${whitebox-multianno}"/>
-        </antcall>
-        <if>
-          <contains string="${javaee.level}" substring="web"/>
-        <then>
-            <echo>create cts-connector-pool-whitebox-permissiondd is not called for web-profile</echo>
-        </then>
-        <else>
-            <antcall target="create-a-connector-resource" >
-                <param name="poolName" value="cts-connector-pool-whitebox-permissiondd.rar"/>
-                <param name="jndiName" value="${whitebox-permissiondd}"/>
-            </antcall>
-        </else>
-        </if>
-
-    </target>
-
-
-    <target name="delete-connection-resources" depends="configPlatform" >
-        <antcall target="delete-a-connector-resource" >
-            <param name="jndiName" value="${whitebox-tx}"/>
-        </antcall>
-
-        <antcall target="delete-a-connector-resource" >
-            <param name="jndiName" value="${whitebox-tx-param}"/>
-        </antcall>
-
-        <antcall target="delete-a-connector-resource" >
-            <param name="jndiName" value="${whitebox-xa}"/>
-        </antcall>
-
-        <antcall target="delete-a-connector-resource" >
-            <param name="jndiName" value="${whitebox-xa-param}"/>
-        </antcall>
-
-        <antcall target="delete-a-connector-resource" >
-            <param name="jndiName" value="${whitebox-notx}"/>
-        </antcall>
-
-        <antcall target="delete-a-connector-resource" >
-            <param name="jndiName" value="${whitebox-notx-param}"/>
-        </antcall>
-
-        <antcall target="delete-a-connector-resource" >
-            <param name="jndiName" value="${whitebox-anno_no_md}"/>
-        </antcall>
-
-        <if>
-          <contains string="${javaee.level}" substring="web"/>
-        <then>
-            <echo>delete jndiName with value whitebox-permissiondd is not called for web-profile</echo>
-        </then>
-        <else>
-            <antcall target="delete-a-connector-resource" >
-                <param name="jndiName" value="${whitebox-permissiondd}"/>
-            </antcall>
-        </else>
-        </if>
-
-        <antcall target="delete-a-connector-resource" >
-            <param name="jndiName" value="${whitebox-ibanno_no_md}"/>
-        </antcall>
-
-        <antcall target="delete-a-connector-resource" >
-            <param name="jndiName" value="${whitebox-mixedmode}"/>
-        </antcall>
-
-        <antcall target="delete-a-connector-resource" >
-            <param name="jndiName" value="${whitebox-mdcomplete}"/>
-        </antcall>
-
-        <antcall target="delete-a-connector-resource" >
-            <param name="jndiName" value="${whitebox-multianno}"/>
-        </antcall>
-    </target>
-
-
-     <target name="create-a-connection-pool" >
-
-        <!--
-              we want to use the same TSRValue that is in ts.jte property of tsrJndiName
-              except that we do not want the preceeding "java:" so we are hardcoding for now.
-          -->
-        <property name="pool_args"
-                  value = "user=${user1}:password=${password1}:TSRValue=comp/TransactionSynchronizationRegistry"/>
-       <exec executable="${exec.asadmin}" >
-            <arg line="${exec.asadmin.part2}" />
-            <arg line=" --user ${admin.user}"/>
-            <arg line=" --passwordfile ${password.file}"/>
-            <arg line=" --host ${server.host}"/>
-            <arg line=" --port ${server.port}"/>
-            <arg line=" create-connector-connection-pool"/>
-            <arg line=" --raname ${rarName}"/>
-            <arg line=" --property ${pool_args}"/>
-            <arg line=" --connectiondefinition com.sun.ts.tests.common.connector.whitebox.TSConnectionFactory"/>
-            <arg line=" ${poolName}"/>
-        </exec>
-     </target>
-
-
-     <target name="delete-connector-connection-pool" >
-        <exec executable="${exec.asadmin}" >
-            <arg line="${exec.asadmin.part2}" />
-            <arg line=" --user ${admin.user}"/>
-            <arg line=" --passwordfile ${password.file}"/>
-            <arg line=" --host ${server.host}"/>
-            <arg line=" --port ${server.port}"/>
-            <arg line=" delete-connector-connection-pool"/>
-            <arg line=" --cascade=true"/>
-            <arg line=" ${poolName}"/>
-        </exec>
-    </target>
-
-
-     <target name="create-a-connector-resource" >
-
-        <propertyregex property="jndiName.minus.prefix"
-                     input="${jndiName}"
-                     regexp="java:comp/env/"
-                     replace=""
-                     casesensitive="false"
-                     override="true"
-                     defaultvalue="${jndiName}"/>
-        
-        <echo>jndiName = ${jndiName} </echo>
-        <echo>jndiName.minus.prefix = ${jndiName.minus.prefix} </echo>
-
-        <exec executable="${exec.asadmin}" >
-            <arg line="${exec.asadmin.part2}" />
-            <arg line=" --user ${admin.user}"/>
-            <arg line=" --passwordfile ${password.file}"/>
-            <arg line=" --host ${server.host}"/>
-            <arg line=" --port ${server.port}"/>
-            <arg line=" create-connector-resource"/>
-            <arg line=" --poolname ${poolName}"/>
-            <arg line=" ${jndiName.minus.prefix}"/>
-        </exec>
-    </target>
-
-
-     <!--
-       Delete a Connector Resource
-     -->
-     <target name="delete-a-connector-resource" >
-
-        <propertyregex property="jndiName.minus.prefix"
-                     input="${jndiName}"
-                     regexp="java:comp/env/"
-                     replace=""
-                     casesensitive="false"
-                     override="true"
-                     defaultvalue="${jndiName}"/>
-        
-        <echo>jndiName = ${jndiName} </echo>
-        <echo>jndiName.minus.prefix = ${jndiName.minus.prefix} </echo>
-        <exec executable="${exec.asadmin}" >
-            <arg line="${exec.asadmin.part2}" />
-            <arg line=" --user ${admin.user}"/>
-            <arg line=" --passwordfile ${password.file}"/>
-            <arg line=" --host ${server.host}"/>
-            <arg line=" --port ${server.port}"/>
-            <arg line=" delete-connector-resource"/>
-            <arg line=" ${jndiName.minus.prefix}"/>
-        </exec>
-     </target>
-
-
-</project>
diff --git a/bin/xml/impl/glassfish/deploy.xml b/bin/xml/impl/glassfish/deploy.xml
deleted file mode 100755
index e5eadaf979..0000000000
--- a/bin/xml/impl/glassfish/deploy.xml
+++ /dev/null
@@ -1,604 +0,0 @@
-<!--
-
-    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
-
--->
-
-<project name="Glassfish Deployment" default="-deploy">
-
-	<!-- Import to be used by stub generation and also includes common-->
-	<import file="./s1as.xml" optional="true"/>
-
-    <!-- PRESETDEFS -->
-    <presetdef name="gf.echo">
-        <echo message="Glassfish:  ${message}"/>
-    </presetdef>
-
-    <presetdef name="gf.fail">
-        <fail message="Glassfish:  ${message}"/>
-    </presetdef>
-
-    <!-- Deployment: DO NOT EDIT -->
-	<!-- Deployment: DO NOT EDIT -->
-	<target name="-deploy">
-
-		<if>
-			<isset property="archive.file"/>
-			<then>
-				<fileset file="${archive.file}" id="deploy.archive.set"/>
-				<gf.echo message="Deploying:  ${archive.file}"/>
-			</then>
-		</if>
-		
-		<ts.glassfish.undeploy>
-			<fileset refid="deploy.archive.set" />
-		</ts.glassfish.undeploy>
-
-		<ts.add.sun.xml.to.component.archive>
-			<fileset refid="deploy.archive.set" />
-		</ts.add.sun.xml.to.component.archive>
-
-		<ts.glassfish.deploy>
-			<fileset refid="deploy.archive.set"/>
-		</ts.glassfish.deploy>
-		
-		<!-- Client stub generation-->
-		<if>
-			<isset property="get.stub.clients"/>
-			<then>
-				 <antcall target="get.client.stubs">
-				 	<param name="deploy.app.name" value="${deploy.app.name}" />
-				 	<param name="get.stub.clients.ts_dep" value="${get.stub.clients.ts_dep}"/>
-				</antcall>
-			</then>
-		</if>
-	</target>
-    
-    <target name="-deploy.all">
-        <ts.glassfish.undeploy> 
-            <fileset refid="deploy.all.archive.set"/>
-        </ts.glassfish.undeploy>
-        
-        <ts.add.sun.xml.to.component.archive> 
-            <fileset refid="deploy.all.archive.set"/>
-        </ts.add.sun.xml.to.component.archive>
-        
-        <ts.glassfish.deploy>
-            <fileset refid="deploy.all.archive.set"/>
-        </ts.glassfish.deploy>
-    </target>
-    
-    <target name="-undeploy.all">
-        <fileset dir="${deploy.dir}" id="undeploy.all.archive.set">
-                <include name="**/*.war"/>
-                <include name="**/*.jar"/>
-                <include name="**/*.car"/>
-                <include name="**/*.ear"/>
-        </fileset>
-        <ts.glassfish.undeploy>
-            <fileset refid="undeploy.all.archive.set"/>
-        </ts.glassfish.undeploy>
-    </target>
-    
-    <target name="-undeploy">
-        <if>
-            <isset property="archive.file"/>
-            <then>
-                <fileset file="${archive.file}" id="deploy.archive.set"/>
-                <gf.echo message="Undeploying:  ${archive.file}"/>
-            </then>
-        </if>
-
-        <ts.glassfish.undeploy>
-            <fileset refid="deploy.archive.set"/>
-        </ts.glassfish.undeploy>    
-    </target>
-
-    <target name="-isdeployed">
-        
-    </target>
-
-    <macrodef name="ts.glassfish.deploy">
-        <element name="archiveset" implicit="yes" optional="true"
-                 description="Fileset for dirs to search for archives"/>
-        <sequential>
-        
-        <var name="deploy.failed" value="false"/>
-        <var name="archive.count" unset="true"/>
-        <var name="glassfish.deploy.wait.time" unset="true"/>
-        
-        <resourcecount property="archive.count">
-            <archiveset/>
-        </resourcecount>
-        <ts.verbose message="archive count - ${archive.count}"/>
-
-        <gf.echo message="${archive.count} archive(s) to deploy"/>
-        <if>
-            <not>
-                <equals arg1="${archive.count}" arg2="0"/>
-            </not>
-        <then>
-            <copy todir="${deploy.dir}" flatten="true">
-                <archiveset/>
-                <chainedmapper>
-                <filtermapper>
-                    <replacestring from="vi_built_" to=""/>
-                </filtermapper>
-                <flattenmapper/>
-                </chainedmapper>
-            </copy>
-            
-            <!-- Set a default in case the deliverable foes not set it in the jte file -->
-            <property name="impl.deploy.timeout.multiplier" value="5"/>
-
-            <math result="glassfish.deploy.wait.time"
-                  operand1="${archive.count}"
-                  operation="*"
-                  operand2="${impl.deploy.timeout.multiplier}"
-                  datatype="int"/>
-
-            <for param="archive">
-                <archiveset/>
-
-            <sequential>
-                <gf.echo message="Deploying archive:  @{archive}"/>
-                <propertyregex property="archive.name.only"
-                  input="@{archive}"
-                  regexp=".*[\/|\\](.*)"
-                  select="\1"
-                  casesensitive="false"
-                  override="true"/>
-
-                <propertyregex property="archive.name.only.minus.vibuilt"
-                     input="${archive.name.only}"
-                     regexp="vi_built_"
-                     replace=""
-                     casesensitive="false"
-                     override="true"
-                     defaultvalue="${archive.name.only}"/>
-                    
-                <ts.verbose message="archive.name.only.minus.vibuilt = ${archive.name.only.minus.vibuilt}"/>
-                
-                <waitfor maxwait="${glassfish.deploy.wait.time}" maxwaitunit="second"
-                         timeoutproperty="deploy.timeout">
-                    <or>
-                        <available file="${deploy.dir}/${archive.name.only.minus.vibuilt}_deployed"/>
-                        <available file="${deploy.dir}/${archive.name.only.minus.vibuilt}_deployFailed"/>
-                    </or>
-                </waitfor>
-
-                <if>
-                    <available file="${deploy.dir}/${archive.name.only.minus.vibuilt}_deployed"/>
-                    <then>
-                        <gf.echo message="Deployment Succeeded:  ${archive.name.only}"/>
-                    </then>
-                <elseif>
-                        <available file="${deploy.dir}/${archive.name.only.minus.vibuilt}_deployFailed"/>
-                    <then>
-                        <gf.echo message="Deployment Failed:  ${archive.name.only}"/>
-                        <var name="deploy.failed" value="true"/>
-                    </then>
-                </elseif>
-                <else>
-                    <!--cleanup any archives since at least one failed-->
-                    <sleep seconds="2"/>
-                    <ts.glassfish.undeploy>
-                        <archiveset/>
-                    </ts.glassfish.undeploy>
-                    <gf.fail message="Deployment timeout reached - ${glassfish.deploy.wait.time} seconds."/>
-                </else>
-                </if>
-
-                <if>
-                    <equals arg1="${deploy.failed}" arg2="true"/>
-                <then>
-                    <!--cleanup any archives since at least one failed-->
-                    <sleep seconds="2"/>
-                    <ts.glassfish.undeploy>
-                        <archiveset/>
-                    </ts.glassfish.undeploy>
-                    <gf.fail message="Deployment Failed for one or more archives.  Check the server log to see which failed."/>
-                </then>
-                </if>
-            </sequential>
-            </for>
-        </then>
-        </if>
-        </sequential>
-    </macrodef>
-
-    <macrodef name="ts.glassfish.undeploy">
-        <element name="archiveset" implicit="yes" optional="true"
-                 description="Fileset for dirs to search for archives"/>
-        <sequential>
-
-        <pathconvert property="files.to.remove"
-                     pathsep=",">
-            <archiveset/>
-            <flattenmapper/>
-        </pathconvert>
-        
-        <if>
-            <contains string="${files.to.remove}" substring="vi_built_"/>
-            <then>
-                <pathconvert property="files.to.remove2"
-                     pathsep=",">
-                    <archiveset/>
-                    <chainedmapper>
-                        <flattenmapper/>
-                        <globmapper from="vi_built_*" to="*"/>
-                    </chainedmapper>
-                </pathconvert>
-                <var name="files.to.remove" value="${files.to.remove2}"/>
-            </then>
-        </if>
-        <ts.verbose message="files.to.remove = ${files.to.remove}"/>
-        <if>
-            <not>
-                <equals arg1="${files.to.remove}" arg2=""/>
-            </not>
-        <then>
-            <fileset dir="${deploy.dir}"
-                     includes="${files.to.remove}"
-                     excludes="**/*ejb_Tsr.ear*"
-                     id="deploy.dir.archiveset">
-            </fileset>
-
-            <var name="files.to.remove" unset="true"/>
-            <pathconvert property="files.to.remove"
-                         pathsep=",">
-                <fileset refid="deploy.dir.archiveset"/>
-                <flattenmapper/>
-            </pathconvert>
-            <ts.verbose message="files.to.remove = ${files.to.remove}"/>
-
-            <var name="archive.count" unset="true"/>
-            <var name="glassfish.deploy.wait.time" unset="true"/>
-
-            <!-- Set a default in case the deliverable foes not set it in the jte file -->
-            <property name="impl.deploy.timeout.multiplier" value="60"/>
-
-            <resourcecount property="archive.count">
-                <fileset refid="deploy.dir.archiveset"/>
-            </resourcecount>
-            <ts.verbose message="archive count - ${archive.count}"/>
-
-            <gf.echo message="${archive.count} archive(s) to undeploy"/>
-            <if>
-                <not>
-                    <equals arg1="${archive.count}" arg2="0"/>
-                </not>
-            <then>
-                <var name="undeploy.failed" value="false"/>
-                <delete includeEmptyDirs="true"
-                    quiet="true">
-                   <fileset refid="deploy.dir.archiveset"/>
-                </delete>
-
-                <math result="glassfish.deploy.wait.time"
-                      operand1="${archive.count}"
-                      operation="*"
-                      operand2="${impl.deploy.timeout.multiplier}"
-                      datatype="int"/>
-
-                <for param="archive" list="${files.to.remove}">
-                <sequential>                  
-                    <if>
-                        <available file="${deploy.dir}/@{archive}_deployFailed"/>
-                    <then>
-                        <delete file="${deploy.dir}/@{archive}_deployFailed"/>
-                        <gf.echo message="Undeployment Succeeded:  @{archive}"/>
-                    </then>
-                    <elseif>
-                        <available file="${deploy.dir}/@{archive}_deployed"/>
-                        <then>
-                            <gf.echo message="Undeploying archive:  @{archive}"/>
-                            <waitfor maxwait="${glassfish.deploy.wait.time}" maxwaitunit="second"
-                                     timeoutproperty="deploy.timeout">
-                                <or>
-                                    <available file="${deploy.dir}/@{archive}_undeployed"/>
-                                    <available file="${deploy.dir}/@{archive}_undeployFailed"/>
-                                </or>
-                            </waitfor>
-
-                            <if>
-                                <available file="${deploy.dir}/@{archive}_undeployed"/>
-                            <then>
-                                <gf.echo message="Undeployment Succeeded:  @{archive}"/>
-                            </then>
-                            <elseif>
-                                    <available file="${deploy.dir}/@{archive}_undeployFailed"/>
-                                <then>
-                                    <gf.echo message="Uneployment Failed:  @{archive}"/>
-                                    <var name="undeploy.failed" value="true"/>
-                                </then>
-                            </elseif>
-                            <else>
-                                <!-- Assume timeout occurred and warn user to either increase timeout -->
-                                <gf.fail message="Undeployment timeout reached - ${glassfish.deploy.wait.time} seconds."/>
-                            </else>
-                            </if>
-
-                            <if>
-                                <equals arg1="${undeploy.failed}" arg2="true"/>
-                            <then>
-                                <gf.fail message="Undeployment Failed for one or more archives.  Check the server log to see which failed."/>
-                            </then>
-                            </if>
-                        </then>
-                    </elseif>
-                    </if>
-                </sequential>
-                </for>
-            </then>
-            </if>
-        </then>
-        </if>
-        </sequential>
-    </macrodef>
-    
-    <macrodef name="ts.add.sun.xml.to.component.archive">
-        <element name="archiveset" implicit="yes" optional="true" 
-                 description="Fileset for dirs to search for archives"/>               
-        <sequential>
-        <for param="archive">
-            <archiveset/>
-                    
-        <sequential>
-            <propertyregex property="archive.name.only"
-              input="@{archive}"
-              regexp=".*[\/|\\](.*)"
-              select="\1"
-              casesensitive="false"
-              override="true"/>
-            
-            <propertyregex property="archive.dir" 
-                           input="@{archive}" 
-                           regexp="[\/|\\]${archive.name.only}" replace=""
-                           casesensitive="false" override="true"/>
-
-            <propertyregex property="archive.name.minus.suffix" override="yes" input="${archive.name.only}"
-                           regexp="(.*)\..*" select="\1" />
-
-            <ts.verbose message="archive.name.minus.suffix = ${archive.name.minus.suffix}"/>            
-
-            <if>
-                <not>
-                    <isset property="archive.file"/>
-                </not>
-            <then>
-                <copy todir="${tmp.dir}" overwrite="true">
-                    <fileset dir="${archive.dir}"
-                             includes="*.sun*.xml"/>
-                </copy>
-
-                <replace dir="${tmp.dir}"
-                     includes="*.sun*.xml">
-                <replacefilter  token="webServerHost.1"  value="${webHost1}"/>
-                        <replacefilter  token="webServerPort.1"  value="${webServerPort}"/>
-                        <replacefilter  token="webServerHost.2"  value="${webServerHost.2}"/>
-                        <replacefilter  token="webServerHost"  value="${webServerHost}"/>
-                        <replacefilter  token="webServerPort"  value="${webServerPort}"/>
-                        <replacefilter  token="securedWebServicePort.1"  value="${securedWebServicePort.1}"/>
-                        <replacefilter  token="securedWebServicePort.2"  value="${securedWebServicePort.2}"/>
-                        <replacefilter  token="securedWebServicePort"  value="${securedWebServicePort}"/>
-                        <replacefilter  token="ts_home"  value="${ts.home}"/>
-                        <replacefilter  token="mailFrom"  value="${mailFrom}"/>
-                        <replacefilter  token="mailHost"  value="${mailHost}"/>
-                        <replacefilter  token="namingServiceHost1"  value="${namingServiceHost1}"/>
-                        <replacefilter  token="namingServicePort1"  value="${namingServicePort1}"/>
-                        <replacefilter  token="namingServiceHost2"  value="${namingServiceHost2}"/>
-                        <replacefilter  token="namingServicePort2"  value="${namingServicePort2}"/>
-                        <replacefilter  token="rauser1"  value="${rauser1}"/>
-                        <replacefilter  token="rauser2"  value="${rauser2}"/>
-                        <replacefilter  token="rapassword1"  value="${rapassword1}"/>
-                        <replacefilter  token="rapassword2"  value="${rapassword2}"/>
-                        <replacefilter  token="user1"  value="${user1}"/>
-                        <replacefilter  token="user2"  value="${user2}"/>
-                        <replacefilter  token="user3"  value="${user3}"/>
-                        <replacefilter  token="password1"  value="${password1}"/>
-                        <replacefilter  token="password1"  value="${password2}"/>
-                        <replacefilter  token="password1"  value="${password3}"/>
-                        <replacefilter  token="wsdlRepository1"  value="${wsdlRepository1}"/>
-                        <replacefilter  token="wsdlRepository2"  value="${wsdlRepository2}"/>
-                 </replace>
-            </then>
-        </if>
-
-            <gf.echo message="Looking at @{archive}"/>
-            
-                    
-            <if>
-               <contains string="${archive.name.only}" substring=".ear"/>
-           <then>
-                    <!-- remove the dir in case it's still hanging around -->
-                    <delete dir="${tmp.dir}/${archive.name.minus.suffix}.dir"
-                            failonerror="false"/>
-                    <mkdir dir="${tmp.dir}/${archive.name.minus.suffix}.dir"/>
-
-                    <unjar src="@{archive}" dest="${tmp.dir}/${archive.name.minus.suffix}.dir"/>
-
-                    <for param="subarchive">
-                        <fileset dir="${tmp.dir}/${archive.name.minus.suffix}.dir"
-                             includes="*.*ar"/>
-                    <sequential>
-
-                    <propertyregex property="subarchive.name.only"
-                                  input="@{subarchive}"
-                                  regexp=".*[\/|\\](.*)"
-                                  select="\1"
-                                  casesensitive="false"
-                                  override="true"/>
-                    <ts.verbose message="subarchive= @{subarchive}"/>
-                    <ts.verbose message="archive.name.only= ${archive.name.only}"/>
-                    <ts.verbose message="archive.name.minus.suffix= ${archive.name.minus.suffix}"/>
-                    <ts.verbose message="subarchive.nameonly= ${subarchive.name.only}"/>
-
-                    <if>
-                        <contains string="${subarchive.name.only}" substring=".war"/>
-                    <then>
-                        <var name="inf.path" value="WEB-INF"/>
-                    </then>
-                    <else>
-                        <var name="inf.path" value="META-INF"/>
-                    </else>
-                    </if>
-
-                    <if>
-                        <contains string="${archive.name.only}" substring="${vi.build.string}"/>
-                    <then>
-                        <jar destfile="@{subarchive}"
-                             duplicate="preserve"
-                             update="true">
-                            <zipfileset dir="${tmp.dir}"
-                                        includes="${vi.build.string}_${subarchive.name.only}.sun-web.xml"
-                                        fullpath="WEB-INF/sun-web.xml"/>
-                            <zipfileset dir="${tmp.dir}"
-                                        includes="${vi.build.string}_${subarchive.name.only}.sun-ejb-jar.xml"
-                                        fullpath="${inf.path}/sun-ejb-jar.xml"/>
-                            <zipfileset dir="${tmp.dir}"
-                                        includes="${vi.build.string}_${subarchive.name.only}.sun-application-client.xml"
-                                        fullpath="META-INF/sun-application-client.xml"/>
-                        </jar>
-                    </then>
-                    <else>
-                        <jar destfile="@{subarchive}"
-                             duplicate="preserve"
-                             update="true">
-                            <zipfileset dir="${tmp.dir}"
-                                        includes="${subarchive.name.only}.sun-web.xml"
-                                        fullpath="WEB-INF/sun-web.xml"/>
-                            <zipfileset dir="${tmp.dir}"
-                                        includes="${subarchive.name.only}.sun-ejb-jar.xml"
-                                        fullpath="${inf.path}/sun-ejb-jar.xml"/>
-                            <zipfileset dir="${tmp.dir}"
-                                        includes="${subarchive.name.only}.sun-application-client.xml"
-                                        fullpath="META-INF/sun-application-client.xml"/>
-                        </jar>
-                    </else>
-                    </if>                    
-
-                    <if>
-                        <available file="${tmp.dir}/${subarchive.name.only}.sun-cmp-mappings.xml"/>
-                    <then>
-                        <jar destfile="@{subarchive}"
-                             duplicate="preserve"
-                             update="true">
-                            <zipfileset dir="${ts.home}/sql"
-                                        includes="CtsSchema.dbschema"
-                                        fullpath="CtsSchema.dbschema"/>
-                            <zipfileset dir="${tmp.dir}"
-                                        includes="${subarchive.name.only}.sun-cmp-mappings.xml"
-                                        fullpath="META-INF/sun-cmp-mappings.xml"/>
-                        </jar>
-                        <gf.echo message="Added ${subarchive.name.only}.sun-cmp-mappings.xml to @{subarchive}"/>
-                        <gf.echo message="Added CtsSchema.dbschema to @{subarchive}"/>
-                    </then>
-                    </if>
-
-                    </sequential>
-                    </for>
-
-                    <jar destfile="@{archive}"
-                         duplicate="preserve"
-                         update="true">
-                        <zipfileset dir="${tmp.dir}/${archive.name.minus.suffix}.dir"
-                                    includes="*.*ar"/>
-                        <zipfileset dir="${tmp.dir}"
-                                    includes="${archive.name.only}.sun-application.xml"
-                                    fullpath="META-INF/sun-application.xml"/>
-                    </jar>
-
-               <delete dir="${tmp.dir}/${archive.name.minus.suffix}.dir"/>
-               </then>
-               <else>
-                    <if>
-                        <contains string="${archive.name.only}" substring=".war"/>
-                    <then>
-                        <var name="inf.path" value="WEB-INF"/>
-                    </then>
-                    <else>
-                        <var name="inf.path" value="META-INF"/>
-                    </else>
-                    </if>
-
-                    <if>
-                        <contains string="${archive.name.only}" substring="${vi.build.string}"/>
-                    <then>
-                        <jar destfile="@{archive}"
-                             duplicate="preserve"
-                             update="true">
-                            <zipfileset dir="${tmp.dir}"
-                                        includes="${vi.build.string}_${archive.name.only}.sun-web.xml"
-                                        fullpath="WEB-INF/sun-web.xml"/>
-                            <zipfileset dir="${tmp.dir}"
-                                        includes="${vi.build.string}_${archive.name.only}.sun-ejb-jar.xml"
-                                        fullpath="${inf.path}/sun-ejb-jar.xml"/>
-                            <zipfileset dir="${tmp.dir}"
-                                        includes="${vi.build.string}_${archive.name.only}.sun-application-client.xml"
-                                        fullpath="META-INF/sun-application-client.xml"/>
-                        </jar>
-                    </then>
-                    <else>
-                        <!--Update with the filtered file from ts.home/tmp if it exists-->
-                        <jar destfile="@{archive}"
-                             duplicate="preserve"
-                             update="true">
-                            <zipfileset dir="${tmp.dir}"
-                                        includes="${archive.name.only}.sun-web.xml"
-                                        fullpath="WEB-INF/sun-web.xml"/>
-                            <zipfileset dir="${tmp.dir}"
-                                        includes="${archive.name.only}.sun-ejb-jar.xml"
-                                        fullpath="${inf.path}/sun-ejb-jar.xml"/>
-                            <zipfileset dir="${tmp.dir}"
-                                        includes="${archive.name.only}.sun-application-client.xml"
-                                        fullpath="META-INF/sun-application-client.xml"/>
-                        </jar>
-                    </else>
-                    </if>
-
-                    <if>
-                        <available file="${tmp.dir}/${archive.name.only}.sun-cmp-mappings.xml"/>
-                    <then>
-                        <jar destfile="@{archive}"
-                             duplicate="preserve"
-                             update="true">
-                            <zipfileset dir="${ts.home}/sql"
-                                        includes="CtsSchema.dbschema"
-                                        fullpath="CtsSchema.dbschema"/>
-                            <zipfileset dir="${tmp.dir}"
-                                        includes="${archive.name.only}.sun-cmp-mappings.xml"
-                                        fullpath="META-INF/sun-cmp-mappings.xml"/>
-                        </jar>
-
-                        <gf.echo message="Added ${archive.name.only}.sun-cmp-mappings.xml to @{archive}"/>
-                        <gf.echo message="Added CtsSchema.dbschema to @{archive}"/>
-                    </then>
-                    </if>
-
-                    <gf.echo message="Added sun xml file(s) to @{archive}"/>
-               </else>
-            </if>
-             
-            <delete>
-                    <fileset dir="${tmp.dir}"
-                             includes="${archive.name.minus.suffix}*.sun*.xml"/>
-            </delete>
-        </sequential>    
-        </for>
-        </sequential>
-    </macrodef>
-    
-</project>
diff --git a/bin/xml/impl/glassfish/install_sjsas.xml b/bin/xml/impl/glassfish/install_sjsas.xml
deleted file mode 100644
index 600fa27c93..0000000000
--- a/bin/xml/impl/glassfish/install_sjsas.xml
+++ /dev/null
@@ -1,1076 +0,0 @@
-<!--
-
-    Copyright (c) 2018, 2020 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
-
--->
-
-<!--
-
-The following facts makes it hard to maintain and generalize:
-(1), locations for promoted and nightly bundles may change as the s1as project 
-     evolves.  For instance, promoted.bundle.dir contains ea, which may be some
-     other string once we reach fcs, or beta. 
-(2), bundle file name contains such string as ea, eval.
-(3), promoted.bundle.dir contains 'latest/bundles', while nightly.build.dir 
-     contains bundles/latest, which is confusing.
-(4), the top level directory name inside the archive contains version number,
-     for instance, sun-appserver7-eval.
-(5), ant directory-based tasks make clear distinction between a single file and
-     a fileset, even if it is a singleton containing only one file. Without
-     having the exact file name, it is impossible to use such tasks.  If we
-     write some custom tasks ...
-(6), how to access release.dir from windows? Mount it in a know location?
-(7), well, we can use pathconvert to convert a fileset to a file.
-
--->
-<project name="install sjsas" basedir="." default="usage">
-  <!-- IMPORTS -->
-  <import file="../../ts.common.props.xml" optional="true"/>
-  <import file="../../../../bin/xml/ts.common.props.xml" optional="true"/>
-
-  <property file="${bin.dir}/ts.jte"/>
-  <property environment="env"/>
-  
-  <!-- s1as.home and javaee.home MUST be absolute path. On windows they MUST 
-  include drive letter, e.g., C:\Sun\AppServer7. s1as.home will be set to the
-  value of javaee.home only if s1as.home has not been set. -->
-  <property name="javaee.home" value="/sun/appserver9"/>
-  <property name="s1as.home" value="${javaee.home}"/>
-
-  <property name="s1as.admin.port" value="4848"/>
-  <property name="s1as.admin.user" value="admin"/>
-  <property name="s1as.admin.passwd" value="adminadmin"/>
-  <property name="sjsas.das.webServerPort" value="8080"/>
-  <property name="sjsas.das.securedWebServicePort" value="1044"/>
-
-  <property name="version" value="9.1.1"/>
-  <property name="filter.value" value="ee"/>
-  <property name="begin.done.tag" value="J2EE 1.4 SDK"/>
-  <property name="s1as.release.dir"
-            value="/net/invalid.domain.com/disk2/releng/weekly/${sjsas.platform}/${version}"/>
-  <property name="statefile.template" value="${common.bin.dir}/xml/impl/glassfish/templates/statefile.template.ee"/>
-  <property name="promoted.bundle.dir" value="${s1as.release.dir}/promoted/latest/latest/bundles"/>
-  <property name="nightly.bundle.dir" value="${s1as.release.dir}/nightly/bundles/latest"/>
-
-<!--
-  <echo message="promoted.bundle.dir=${promoted.bundle.dir}"/>
-  <echo message="nightly.bundle.dir=${nightly.bundle.dir}"/>
--->
-	
-  <!-- it will be deleted during install. Make sure it is not used for any other purpose! -->
-  <!-- java.io.tmpdir is too long on windows and path exceeds 260 characters -->
-  <property name="copy.bundle.to" value="/tmp/s1as_install_stage"/>
-
-  <!-- <property name="rename.bundle.to" value="s1aspe_bundle.zip"/> -->
-  <!-- <property name="archive.top.dir" value="sun-appserver7-eval"/> -->
-  <property name="class.id.file" value="${java.io.tmpdir}/${user.name}_s1as_appserv_cid"/>
-  <property name="statefile" value="${java.io.tmpdir}/${user.name}_s1as_appserv_st"/>
-   
-  <target name="-init" depends="-check-os, -os-specific">
-    <fail message="JAVA_HOME not set" unless="env.JAVA_HOME"/>
-    <mkdir dir="${s1as.home}"/>
-    <if>
-      <equals arg1="${sjsas.platform}" arg2="SJSAS_EE"/>
-      <then>
-        <property name="platform.version" value="ee"/>
-      </then>
-      <else> 
-        <property name="platform.version" value=""/>
-      </else>
-    </if>
-    <echo message="platform version = ${platform.version}"/>
-  </target>
-
-  <target name="-check-os">
-    <condition property ="is.unix">
-      <os family="unix"/>
-    </condition>
-    <condition property="which.os" value="linux">
-      <equals arg1="${os.name}" arg2="Linux"/>
-    </condition>
-    <condition property="which.os" value="solaris-i586">
-     <and>
-      <equals arg1="${os.name}" arg2="SunOS"/>
-      <equals arg1="${os.arch}" arg2="x86"/>
-     </and>
-    </condition>
-    <condition property="which.os" value="solaris-${os.arch}">
-      <equals arg1="${os.name}" arg2="SunOS"/>
-    </condition>
-    <property name="which.os" value="windows"/>
-  </target>    
-
-  <target name="-os-specific" depends="-check-os, -unix-specific, -windows-specific">
-  </target>
- 
-  <target name="-unix-specific" if="is.unix">
-    <property name="setup.arg.1" value=""/>
-    <property name="uninstall.arg.1" value=""/>
-    <property name="asadmin.exe" value="${s1as.home}/bin/asadmin"/>
-    <property name="asadmin.arg.1" value=""/>
-    <property name="os.type" value="unix"/>
-    <property name="unzip.command" value="unzip"/>
-  </target>
-
-  <target name="check.for.zip.path" unless="unzip.path">
-    <fail>Error, users must define the unzip.path property on Windows</fail>
-  </target>
-
-  <target name="-windows-specific" unless="is.unix">
-    <property name="setup.arg.1" value="/c setup.dos.exe"/>
-    <property name="uninstall.arg.1" value="/c uninstall"/>
-    <property name="asadmin.exe" value="cmd.exe"/>
-    <property name="asadmin.arg.1" value="/c asadmin"/>
-    <property name="os.type" value="windows"/>
-    <antcall target="check.for.zip.path"/>
-    <!-- may need to do a path convert on the ${unzip.path} for the exec to work -->
-    <!-- these targets are seldom if ever used on Windows                        -->
-    <property name="unzip.command" value="cmd.exe /c ${unzip.path}"/>
-  </target>
-
-  <target name="promoted" description="install the latest promoted bundle"
-    depends="-init">
-    <echo message="Statefile being used is ${statefile.template}"/>
-    <fileset id="promoted.zip.path.ref" dir="${promoted.bundle.dir}">
-      <include name="s*${platform.version}*${which.os}*"/>
-      <exclude name="*-app-*"/>
-      <exclude name="*dbg*"/>
-      <exclude name="*${filter.value}*"/>      
-      <or>
-      <filename name="*2003.bin"/>
-      <filename name="*2004.bin"/>
-      <filename name="*2005.bin"/>
-      <filename name="*2006.bin"/>
-      <filename name="*2007.bin"/>
-      <filename name="*2008.bin"/>
-      </or>
-    </fileset>
-    <pathconvert targetos="${os.type}" property="zip.file.path" refid="promoted.zip.path.ref"/>
-
-    <property name="download.summary" 
-      value="Downloaded from: '${zip.file.path}'"/>
-    <echo message="Downloaded from: '${zip.file.path}'"/>
-    <antcall target="-install-internal">
-      <param name="unzip.what" value="${zip.file.path}"/>
-    </antcall>
-  </target>
-
-  <target name="nightly" description="install the latest nightly bundle"
-    depends="-init">
-    <echo message="Statefile being used is ${statefile.template}"/>
-    <fileset id="nightly.zip.path.ref" dir="${nightly.bundle.dir}">
-      <include name="s*${platform.version}*${which.os}*"/>
-      <exclude name="*-app-*"/>
-      <exclude name="*dbg*"/>
-      <exclude name="*${filter.value}*"/>
-      <or>
-      <filename name="*2003.bin"/>
-      <filename name="*2004.bin"/>
-      <filename name="*2005.bin"/>
-      <filename name="*2006.bin"/>
-      <filename name="*2007.bin"/>
-      <filename name="*2008.bin"/>
-      </or>
-    </fileset>
-    <pathconvert targetos="${os.type}" property="zip.file.path" refid="nightly.zip.path.ref"/>
-    <property name="download.summary" 
-      value="Downloaded from: ${zip.file.path}"/>
-    <echo message="Downloaded from: '${zip.file.path}'"/>
-    <antcall target="-install-internal">
-      <param name="unzip.what" value="${zip.file.path}"/>
-    </antcall>
-  </target>
-
-  <target name="bundle" description="install any specified bundle"
-    depends="-init, -check-bundle">
-    <property name="download.summary" value="Downloaded from: ${bundle}"/>
-    <echo message="Downloaded from: '${bundle}'"/>
-    <antcall target="-install-internal">
-      <param name="unzip.what" value="${bundle}"/>
-    </antcall>
-  </target>
-
-  <target name="-check-bundle">
-    <fail message="Please set bundle property, e.g., -Dbundle=/files.../foo.zip"
-      unless="bundle"/>
-    <available file="${bundle}" property="valid.bundle.path"/>
-    <fail message="Does not exist:${bundle}" unless="valid.bundle.path"/>
-  </target>
-
-  <target name="-install-internal">
-    <delete failonerror="false" includeEmptyDirs="true">
-      <fileset dir="${copy.bundle.to}"/>
-    </delete>
-    <mkdir dir="${copy.bundle.to}"/>
-    <copy file="${unzip.what}" tofile="${copy.bundle.to}/bundle.zip"/>
-    <exec executable="${unzip.command}" dir="${copy.bundle.to}">
-      <arg line="bundle.zip"/>
-    </exec>
-    <path id="copy.bundle.to.ref">
-      <pathelement location="${copy.bundle.to}"/>
-    </path>
-    <pathconvert targetos="${os.type}" property="s1as.installer.home" refid="copy.bundle.to.ref"/>
-    <antcall target="install.s1as8">
-    </antcall>
-  </target>
-
-  <target name="install.s1as8" depends="-init, -check-s1as-installer-home" 
-    description="Run setup either directly or after downloading and unzipping bundle. 
-    If invoked directly, must set -Ds1as.installer.home={parent-dir-of-setup-script}, unless
-    pwd is the s1as.installer.home">
-    <chmod perm="a+rx">
-      <fileset dir="${s1as.installer.home}" includes="setup*"/>
-    </chmod>
-    <echo message="Install to ${s1as.home}"/>
-    <antcall target="uninstall.s1as"/>
-    <delete failonerror="false" includeEmptyDirs="true">
-      <fileset dir="${s1as.home}"/>
-    </delete>
-    
-    <antcall target="-exec-setup"/>
-    <property name="download.summary" value=""/>
-    <property name="install.summary.1" value="Installed  from: ${s1as.installer.home}"/>
-    <property name="install.summary.2" value="Installed    to: ${s1as.home}"/>
-    <antcall target="-post-install"/> 
-  </target>
-
-  <target name="install" depends="install.s1as8"/>
-
-  <target name="-check-s1as-installer-home" unless="s1as.installer.home">
-   <echo message="s1as.installer.home not set, try pwd ..."/>
-   <available file="${user.dir}/appserv.class" property="valid.s1as.installer.home"/>
-   <fail unless="valid.s1as.installer.home" message="${user.dir} not a valid installer home"/>
-   <echo message="OK, use ${user.dir} as s1as.installer.home"/>
-   <property name="s1as.installer.home" value="${user.dir}"/> 
-  </target>
-  
-  <target name="-exec-setup" depends="-create-statefile">
-    <condition property="setup.exe" value="${s1as.installer.home}/setup">
-      <os family="unix"/>
-    </condition>
-    <property name="setup.exe" value="cmd.exe"/>
-    <exec dir="${s1as.installer.home}" executable="${setup.exe}" output="/tmp/install_sjsas.log" resultproperty="return.code">
-      <arg line="${setup.arg.1}"/>
-      <arg value="-silent"/>
-      <arg value="${statefile}"/>
-    </exec>
-<!--    <echo message="Setup return code is ${return.code}"/> -->
-  </target>
-
-  <target name="-create-statefile" depends="-get-class-id">
-    <path id="s1as.home.ref">
-      <pathelement location="${s1as.home}"/>
-    </path>
-    <pathconvert targetos="${os.type}" property="s1as.home.converted"
-      refid="s1as.home.ref"/>
-    
-    <copy overwrite="true" tofile="${statefile}" file="${statefile.template}">
-      <filterset>
-        <filter token="s1as.home" value="${s1as.home.converted}"/>
-        <filter token="java.home" value="${env.JAVA_HOME}"/>
-        <filter token="begin.done.tag" value="${begin.done.tag}"/>
-        <filter token="class.id" value="${class.id}"/>
-        <filter token="s1as.admin.user" value="${s1as.admin.user}"/>
-        <filter token="s1as.admin.passwd" value="${s1as.admin.passwd}"/>
-        <filter token="s1as.admin.port" value="${s1as.admin.port}"/>
-        <filter token="sjsas.das.webServerPort" value="${sjsas.das.webServerPort}"/>
-        <filter token="sjsas.das.securedWebServicePort" value="${sjsas.das.securedWebServicePort}"/>
-      </filterset>
-    </copy>
-  </target>
-
-  <target name="-get-class-id">      
-     <java classname="appserv" fork="true" output="${class.id.file}" maxmemory="256m">
-        <arg value="-id"/> 
-        <classpath>
-          <pathelement location="${s1as.installer.home}"/>
-        </classpath>
-     </java>
-     <loadfile property="class.id" srcfile="${class.id.file}">
-       <filterchain>
-         <striplinebreaks/>
-       </filterchain>
-     </loadfile>
-     <echo message="class.id=`${class.id}`"/>
-  </target>
-
-  <target name="-post-install">
-    <delete failonerror="false" includeEmptyDirs="true">
-      <fileset dir="${s1as.home}" includes="statefile*, temp_install/"/>
-    </delete>
-    <delete file="${class.id.file}" quiet="true"/>
-    <echo message="---------------------------------------------"/>
-    <echo message="${download.summary}"/>
-    <echo message="${install.summary.1}"/>
-    <echo message="${install.summary.2}"/>
-    <echo message="---------------------------------------------"/>
-    <echo message="If install failed, check ${s1as.home}/install.log for details."/>
-    <echo message="To upgrade/display license, 'asadmin install-license | display-license --local'"/>
-  </target>
-
-  <target name="-is-uninstall-needed" depends="-init">
-    <available file="${s1as.home}/lib/appserv-rt.jar" property="uninstall.needed"/>
-  </target>
-
-  <target name="uninstall.s1as" depends="-init, -is-uninstall-needed, -uninstall-internal" 
-    description="uninstall s1as, and if necessary first stop servers.">
-  </target>
-
-  <target name="-uninstall-internal" if="uninstall.needed" 
-    depends="-is-uninstall-needed, stop.s1as">
-    <condition property="uninstall.exe" value="${s1as.home}/uninstall">
-      <os family="unix"/>
-    </condition>
-    <property name="uninstall.exe" value="cmd.exe"/>
-    <chmod perm="a+rx" file="${s1as.home}/uninstall"/>
-    <exec dir="${s1as.home}" executable="${uninstall.exe}" failifexecutionfails="no"
-      timeout="900000" failonerror="false">  <!-- uninstall always returns 1, not sure why -->
-      <arg line="${uninstall.arg.1}"/>
-      <arg value="-silent"/>
-      <arg value="-javahome"/>
-      <arg value="${env.JAVA_HOME}"/>
-    </exec>
-  </target>
-
-  <target name="-is-stop-needed">
-    <!-- no such file on windows -->
-    <available property="stop.needed" file="${s1as.home}/bin" type="dir"/>
-  </target>
-  
-  <target name="stop.s1as" depends="-init, -is-stop-needed" if="stop.needed"
-    description="stop s1as, same as 'asadmin stop-domain' ">
-    <exec dir="${s1as.home}/bin" executable="${asadmin.exe}"
-      timeout="600000" failonerror="false" failifexecutionfails="false">
-      <arg line="${asadmin.arg.1}"/>
-      <arg value="stop-domain"/>
-    </exec>
-  </target>
-
-  <target name="usage">
-    <echo message="Type ant -projecthelp for a list of public targets"/>
-    <echo message=""/>
-    <echo message="If you already have a unzipped bundle s1as 8:"/>
-    <echo message="  ant install.s1as8 -Ds1as.installer.home={parent_dir_of_setup_file}, or"/>
-    <echo message="  cd {parent_dir_of_setup_file}; ant install.s1as8"/>
-    <echo message=""/>
-    <echo message="If you already have a unzipped bundle s1as 7:"/>
-    <echo message="  ant install.s1as7 -Ds1as.installer.home={parent_dir_of_setup_file}, or"/>
-    <echo message="  cd {parent_dir_of_setup_file}; ant install.s1as7"/>
-    <echo message=""/>
-    <echo message="If you need to download the latest promoted bundle and install:"/>
-    <echo message="  ant promoted "/>
-    <echo message="  by default looks for a bundle for your os in"/>
-    <echo message="  ${promoted.bundle.dir}/*${which.os}*"/>
-    <echo message=""/>
-    <echo message="If you need to download the latest nightly bundle and install:"/>
-    <echo message="  ant nightly "/>
-    <echo message="  by default looks for a bundle for your os in"/>
-    <echo message="  ${nightly.bundle.dir}/*${which.os}*"/>
-    <echo message=""/>
-    <echo message="If you need to download a specific bundle and install:"/>
-    <echo message="  ant bundle -Dbundle={path_to_the_bundle}"/>
-    <echo message="  if this bundle is frequently used, add a bundle property"/>
-    <echo message="  to this file instead of -D option"/>
-    <echo message=""/>
-    <echo message="If there already exists a s1as installation, will first uninstall it."/>
-    <echo message="If any s1as server is running, will first stop it before uninstalling."/>
-    <echo message="  ant stop.s1as  # Do we need a start.s1as ? "/>
-    <echo message=""/>
-    <echo message="Properties:"/>
-    <echo message="  If there exists build.properties in the same dir, all props are loaded,"/>
-    <echo message="  and take predence over any properties defined in this file.  Otherwise,"/>
-    <echo message="  predefined default values are used."/>
-  </target>
-
-
-
-  <!-- ************************************************************************* -->
-  <!-- The following properties and targets can be used to install GlassFish V3. -->
-  <!-- This includes the promoted as well as the nightly builds.                 -->
-  <!-- ************************************************************************* -->
-    <property name="v32.base.url"       value="http://download.java.net/glassfish/3.2"/>
-    <property name="v31.base.url"       value="http://download.java.net/glassfish/3.1"/>
-    <property name="v311.base.url"       value="http://download.java.net/glassfish/3.1.1"/>
-    <property name="v312.base.url"       value="http://download.java.net/glassfish/3.1.2"/>
-    <property name="v3.base.url"       value="http://download.java.net/glassfish/3.0.1"/>
-    <property name="v4.base.url"       value="http://download.java.net/glassfish/4.0"/>
-    <property name="v4.base.url.owan"  value="http://invalid.domain.com/java/re/glassfish/4.0"/>
-    <property name="v401.base.url"       value="http://download.java.net/glassfish/4.0.1"/>
-    <property name="v401.base.url.owan"  value="http://invalid.domain.com/java/re/glassfish/4.0.1"/>
-    <property name="v3.nightly.dir"    value="nightly"/>
-    <property name="v4.nightly.dir"    value="nightly"/>
-    <property name="nightly.link"      value="latest-glassfish.zip"/>
-    <property name="nightly.ri.link"      value="latest-ri.zip"/>
-    <property name="nightly.web.link"  value="latest-web.zip"/>
-    <property name="v3.promoted.dir"   value="promoted"/>
-    <property name="v4.promoted.dir"   value="promoted"/>
-    <property name="promoted.link"     value="latest-glassfish.zip"/>
-    <property name="promoted.ri.link"     value="latest-ri.zip"/>
-    <property name="promoted.web.link" value="latest-web.zip"/>
-    <property name="promoted.url"      value="${v3.base.url}/${v3.promoted.dir}/${promoted.link}"/>
-    <property name="nightly.url"       value="${v3.base.url}/${v3.nightly.dir}/${nightly.link}"/>
-    <property name="promoted.web.url"  value="${v3.base.url}/${v3.promoted.dir}/${promoted.web.link}"/>
-    <property name="nightly.web.url"   value="${v3.base.url}/${v3.nightly.dir}/${nightly.web.link}"/>
-    <property name="v31.promoted.url"      value="${v31.base.url}/${v3.promoted.dir}/${promoted.link}"/>
-    <property name="v31.nightly.url"       value="${v31.base.url}/${v3.nightly.dir}/${nightly.link}"/>
-    <property name="v31.promoted.web.url"  value="${v31.base.url}/${v3.promoted.dir}/${promoted.web.link}"/>
-    <property name="v31.nightly.web.url"   value="${v31.base.url}/${v3.nightly.dir}/${nightly.web.link}"/>
-    <property name="v311.promoted.url"      value="${v311.base.url}/${v3.promoted.dir}/${promoted.link}"/>
-    <property name="v311.nightly.url"       value="${v311.base.url}/${v3.nightly.dir}/${nightly.link}"/>
-    <property name="v311.promoted.web.url"  value="${v311.base.url}/${v3.promoted.dir}/${promoted.web.link}"/>
-    <property name="v311.nightly.web.url"   value="${v311.base.url}/${v3.nightly.dir}/${nightly.web.link}"/>
-    <property name="v312.promoted.url"      value="${v312.base.url}/${v3.promoted.dir}/${promoted.link}"/>
-    <property name="v312.nightly.url"       value="${v312.base.url}/${v3.nightly.dir}/${nightly.link}"/>
-    <property name="v312.promoted.web.url"  value="${v312.base.url}/${v3.promoted.dir}/${promoted.web.link}"/>
-    <property name="v312.nightly.web.url"   value="${v312.base.url}/${v3.nightly.dir}/${nightly.web.link}"/>
-    <property name="v32.promoted.url"      value="${v32.base.url}/${v3.promoted.dir}/${promoted.link}"/>
-    <property name="v32.nightly.url"       value="${v32.base.url}/${v3.nightly.dir}/${nightly.link}"/>
-    <property name="v32.promoted.web.url"  value="${v32.base.url}/${v3.promoted.dir}/${promoted.web.link}"/>
-    <property name="v32.nightly.web.url"   value="${v32.base.url}/${v3.nightly.dir}/${nightly.web.link}"/>
-    <property name="v4.promoted.url"      value="${v4.base.url}/${v4.promoted.dir}/${promoted.link}"/>
-    <property name="v4.nightly.url"       value="${v4.base.url}/${v4.nightly.dir}/${nightly.link}"/>
-    <property name="v4.promoted.url.owan" value="${v4.base.url.owan}/${v4.promoted.dir}/latest/${promoted.link}"/>
-    <property name="v4.nightly.url.owan"  value="${v4.base.url.owan}/${v4.nightly.dir}/latest/${nightly.link}"/>
-    <property name="v4.promoted.web.url"  value="${v4.base.url}/${v4.promoted.dir}/${promoted.web.link}"/>
-    <property name="v4.nightly.web.url"   value="${v4.base.url}/${v4.nightly.dir}/${nightly.web.link}"/>
-    <property name="v401.promoted.url"      value="${v401.base.url}/${v4.promoted.dir}/${promoted.link}"/>
-    <property name="v401.nightly.url"       value="${v401.base.url}/${v4.nightly.dir}/${nightly.link}"/>
-    <property name="v401.promoted.url.owan" value="${v401.base.url.owan}/${v4.promoted.dir}/latest/${promoted.link}"/>
-    <property name="v401.nightly.url.owan"  value="${v401.base.url.owan}/${v4.nightly.dir}/latest/${nightly.link}"/>
-    <property name="v401.promoted.web.url"  value="${v401.base.url}/${v4.promoted.dir}/${promoted.web.link}"/>
-    <property name="v401.nightly.web.url"   value="${v401.base.url}/${v4.nightly.dir}/${nightly.web.link}"/>
-    <property name="temp.dir"          value="${java.io.tmpdir}"/>
-    <property name="v3.filename"       value="v3.zip"/>
-    <property name="v4.filename"       value="v4.zip"/>
-    <property name="v3.install.dir"    value="${javaee.home.ri}"/>
-    <property name="v4.install.dir"    value="${javaee.home.ri}"/>
-    <property name="get.verbose"       value="true"/>
-    <property name="v3.hudson.url"
-              value="http://hudson.glassfish.org/job/gf-trunk-build-continuous/lastSuccessfulBuild/artifact/bundles"/>
-    <property name="v3.cont.url"     value="${v3.hudson.url}/glassfish.zip"/>
-    <property name="v3.cont.web.url" value="${v3.hudson.url}/web.zip"/>
-
-  <!--
-       Attempt to stop the domain, if it is running, using the stopserv script.  Note,
-       using asadmin stop-domain from within ant currently does not work.  It assumes the
-       domain lives in /var/appserver/domains and there does not seem to be a way to fix
-       this.  All attempts at using the domaindir option failed.  This may be a bug in
-       asamdin or an antism since asadmin stop-domain works fine on the command line.
-  -->
-  <presetdef name="stop.domain">
-    <if>
-      <os family="unix"/>
-    <then>
-      <exec dir="${v3.installed.dir}/bin" executable="${v3.installed.dir}/bin/stopserv">
-        <env key="PATH" path="${java.home}/bin:${env.PATH}"/>
-      </exec>
-      <sleep seconds="2"/>
-    </then>
-    <elseif>
-      <or>
-        <os family="windows"/>
-        <os family="dos"/>
-      </or>
-    <then>
-      <exec dir="${v3.installed.dir}/bin" executable="${v3.installed.dir}/bin/stopserv.bat">
-        <env key="PATH" path="${java.home}/bin:${env.PATH}"/>
-      </exec>
-    	<sleep seconds="2"/>
-    </then>
-    </elseif>
-    <else> <!-- should not happen -->
-      <echo>ERROR, Neither Windows nor Unix</echo>
-    </else>
-    </if>
-  </presetdef>
-
-
-  <macrodef name="install.v3">
-    <attribute name="bundle.url"/>
-  	<attribute name="is.v31" default="false"/>
-    <sequential>
-
-      <!-- 
-           Download the bundle from the appropriate URL, only if it is newer than the one
-           in ${java.io.tmpdir}.  Added a skip.v3.get property since users may want to keep using the
-           V3 bundle in their tmp directory even though a newer version may be available.
-           Usage example:
-             ant -f install_sjsas.xml -Dskip.v3.get=true install.v3.nightly
-      -->
-    	<if>
-    	  <not><isset property="skip.v3.get"/></not>
-      <then>
-        <get src="@{bundle.url}" dest="${temp.dir}/${v3.filename}"
-             usetimestamp="true" verbose="${get.verbose}"/>
-      </then>
-      </if>
-    	
-      <!--
-           Use a propregex here to peel off the glassfishv3/glassfish from the end
-           of the specified install.dir.  This is useful if the install.dir is pulled from
-           the ts.jte property javaee.home.ri.  Since javaee.home will end with
-           glassfishv3/glassfish.  This is the directory structure created when the
-           platform independent zip is unzipped. So if users use the javaee.home.ri property
-           to specify the install.dir they will want the glassfishv3/glassfish
-           stripped off the directory where the bundle is unzipped.  If the install.dir
-           does not end in glassfishv3/glassfish it will be left alone.  This will
-           happen when users pass the install.dir property during the ant invocation.
-           
-           Starting in version 3.1, the zip bundle contains a top level glassfish3 directory.
-           This is different from 3.0 and 3.0.1 which contained a glassfishv3 directory.  The
-           "v" has been removed.  So we account for this by setting a v3.install.path to
-           glassfish3 for version 3.1 else we set it to glassfishv3 for previous versions.
-           
-           Note, the ts.jte javaee.home.ri property must be set appropriately for the version being
-           installed for the install tasks to function properly.  For V 3.0 and 3.0.1 the install
-           path should end with glassfishv3/glassfish.  For version 3.1 the install path should
-           end with glassfish3/glassfish.  Users should also use the appropriate install targets.
-           Namely install.v31 to install version 3.1 and install.v3 targets to install the previous
-           versions 3.0 and 3.0.1.
-      -->
-      <if>
-    	<istrue value="@{is.v31}"/>
-      <then>
-        <property name="v3.install.path" value="glassfish3"/>
-        <echo>*** Installing GF Version 3.1/3.2 setting v3.install.path to glassfish3 ***</echo>
-      </then>
-      <else>
-        <echo>*** Installing GF V3.0.X setting v3.install.path to glassfishv3 ***</echo>
-      	<property name="v3.install.path" value="glassfishv3"/>
-      </else>
-      </if>
-      
-      <!-- Check the target being run matches the v3.install.dir property.  -->
-      <!-- By default the v3.install.dir value is set to javaee.home.ri.    -->
-      <!-- Users can bypass this check by setting the expert.mode prop to   -->
-      <!-- true using the -D option.  Ex. -Dexpert.mode=true                -->
-      <property name="expert.mode" value="false"/>
-      <if>
-        <not><istrue value="${expert.mode}"/></not>
-      <then>
-        <propertyregex property="v3.dir.matches"
-                       input="${v3.install.dir}"
-                       regexp="${v3.install.path}"
-                       select="true"
-                       defaultValue="false"/>
-         
-        <if>
-          <not><istrue value="${v3.dir.matches}"/></not>
-        <then>
-          <fail>ERROR
-          ${line.separator}
-          *****************************************************************
-           Error, the target being run does not match the v3.install.dir.
-           Please verify the javaee.home.ri setting in your ts.jte and make
-           sure you are running the appropriate install target.
-              v3.install.dir                   -> ${v3.install.dir}
-              running a v3.1 (or 3.2) install target is -> @{is.v31}
-            
-             * If you know what you are doing and want to skip this check,
-               pass -Dexpert.mode=true to the install target.
-          *****************************************************************
-          ${line.separator}
-          </fail>
-        </then>
-        </if>
-      </then>
-      <else>
-        <echo>*** Running in EXPERT MODE, checks disabled, strange errors could occur. ***</echo>
-      </else>
-      </if>
-      
-      <propertyregex property="v3.install.dir.norm"
-                     input="${v3.install.dir}"
-                     regexp="(.*)/${v3.install.path}/glassfish"
-                     select="\1"
-                     defaultValue="${v3.install.dir}"/>
-      <property name="v3.installed.dir"
-                value="${v3.install.dir.norm}/${v3.install.path}/glassfish"/>
-    	
-      <!--
-           If the install directory exists, attempt to stop the domain and remove
-           the exisitng directory.
-      -->
-      <if>
-        <available file="${v3.install.dir}" type="dir"/>
-      <then>
-        <echo>Found existing V3 install.  Stopping domain and removing:</echo>
-        <echo>   ${v3.install.dir.norm}/${v3.install.path}</echo>
-        <echo>** PATH passed to exec is "${java.home}/bin:${env.PATH}" **</echo>
-        <stop.domain/>
-      	<delete dir="${v3.install.dir.norm}/${v3.install.path}" includeemptydirs="true"/>
-      </then>
-      </if>
-
-      <unzip src="${temp.dir}/${v3.filename}" dest="${v3.install.dir.norm}"/>
-
-    	<!-- If this is a continuous hudson build the unzipped bundle will not contain        -->
-    	<!-- a glassfishv3 directory, instead the directory where the bundle is unzipped      -->
-    	<!-- will contain a glassfish and an mq directory.  In this bundle the javadb         -->
-    	<!-- directory is under glassfish so this needs to be moved as well.  To fix this     -->
-    	<!-- we create a glassfish(v)3 directory and move the glassfish and mq directories      -->
-    	<!-- into the new glassfish(v)3 directory.  We also move the glassfish/javadb directory -->
-    	<!-- under glassfishv3 as well.  This keeps the resulting directory structure of      -->
-    	<!-- all the install tasks uniform.                                                   -->
-    	<if>
-        <available file="${v3.install.dir.norm}/glassfish" type="dir"/>
-      <then>
-        <mkdir dir="${v3.install.dir.norm}/${v3.install.path}/javadb"/>
-        <move todir="${v3.install.dir.norm}/${v3.install.path}/javadb">
-          <fileset dir="${v3.install.dir.norm}/glassfish/javadb"/>
-        </move>
-        <mkdir dir="${v3.install.dir.norm}/${v3.install.path}/glassfish"/>
-        <move todir="${v3.install.dir.norm}/${v3.install.path}/glassfish">
-          <fileset dir="${v3.install.dir.norm}/glassfish"/>
-        </move>
-      </then>
-      </if>
-
-    	<!-- The web bundles do not have mq in them. -->
-    	<if>
-    	  <available file="${v3.install.dir.norm}/mq" type="dir"/>
-    	<then>
-        <mkdir dir="${v3.install.dir.norm}/${v3.install.path}/mq"/>
-        <move todir="${v3.install.dir.norm}/${v3.install.path}/mq">
-          <fileset dir="${v3.install.dir.norm}/mq"/>
-        </move>
-      </then>
-    	</if>
-      	
-      <!--
-           On Unices, set the execute bit on all scripts that may be used by our TCKs.
-      -->
-      <chmod dir="${v3.installed.dir}/bin"           perm="755" excludes="*.bat"/>
-      <chmod dir="${v3.installed.dir}/../javadb/bin" perm="755" excludes="*.bat"/>
-
-    	<!-- There is no mq directory in the web bundles. -->
-    	<if>
-    	  <available file="${v3.installed.dir}/../mq/bin" type="dir"/>
-    	<then>
-    	  <chmod dir="${v3.installed.dir}/../mq/bin" perm="755" excludes="*.bat"/>
-    	</then>
-    	</if>
-    	
-    	<!-- There is no top level bin directory in the Hudson continuous builds. -->
-    	<if> 
-    		<available file="${v3.installed.dir}/../bin" type="dir"/>
-    	<then>
-        <chmod dir="${v3.installed.dir}/../bin" perm="755" excludes="*.bat"/>
-      </then>
-    	</if>
-
-      <!-- Don't delete the downloaded bundle in ${java.io.tmpdir} since we use the timestamp -->
-      <!-- attribute when downloading the bundle.  This way users can reinstall V3 without    -->
-      <!-- redownloading the bundle.  The bundle will only be downloaded when there is a      -->
-      <!-- version available that is newer than the one in ${java.io.tmpdir}                  -->
-
-      <!-- Set the admin port in the domain.xml file using a sed like command.  Doing this -->
-      <!-- step here may keep us from having to use the silent install. This allows us to  -->
-      <!-- use the platform agnostic bundle as well cleaning up the overhead associated    -->
-      <!-- with using the silent install feature, such as managing state files and finding -->
-      <!-- platform specific binaries.                                                     -->
-      <property name="port.to.use" value="${ri.admin.port}"/>
-      <property name="port.to.find" value="4848"/>
-      <property name ="domain.file"
-                value="${v3.installed.dir}/domains/domain1/config/domain.xml"/>
-      <loadfile property="domain.file.contents" srcfile="${domain.file}"/>
-      <propertyregex property="port.not.found"
-                     input="${domain.file.contents}"
-                     regexp='port="${port.to.find}"'
-                     replace='port="${port.to.use}"'
-                     defaultvalue="true"/>
-      <if>
-        <istrue value="${port.not.found}"/>
-      <then>
-        <echo>Port ${port.to.find} not found, so admin port not reset in domain.xml.</echo>
-      </then>
-      <else>
-        <echo>Port ${port.to.find} found, reset to ${port.to.use}.</echo>
-        <echo>Backing up ${domain.file}.</echo>
-        <copy file="${domain.file}" tofile="${domain.file}.original" failonerror="false"/>
-        <echo message="${port.not.found}" file="${domain.file}"/>
-        <echo>${domain.file} written to disk.</echo>
-      </else>
-      </if>
-
-
-   </sequential>
-  </macrodef>
-
-	
-	
-  <!--
-       Attempt to stop the domain, if it is running, using the stopserv script.  Note,
-       using asadmin stop-domain from within ant currently does not work.  It assumes the
-       domain lives in /var/appserver/domains and there does not seem to be a way to fix
-       this.  All attempts at using the domaindir option failed.  This may be a bug in
-       asamdin or an antism since asadmin stop-domain works fine on the command line.
-  -->
-  <presetdef name="stop.v4.domain">
-    <if>
-      <os family="unix"/>
-    <then>
-      <exec dir="${v4.installed.dir}/bin" executable="${v4.installed.dir}/bin/stopserv">
-        <env key="PATH" path="${java.home}/bin:${env.PATH}"/>
-      </exec>
-      <sleep seconds="2"/>
-    </then>
-    <elseif>
-      <or>
-        <os family="windows"/>
-        <os family="dos"/>
-      </or>
-    <then>
-      <exec dir="${v4.installed.dir}/bin" executable="${v4.installed.dir}/bin/stopserv.bat">
-        <env key="PATH" path="${java.home}/bin:${env.PATH}"/>
-      </exec>
-        <sleep seconds="2"/>
-    </then>
-    </elseif>
-    <else> <!-- should not happen -->
-      <echo>ERROR, Neither Windows nor Unix</echo>
-    </else>
-    </if>
-  </presetdef>
-
-
-
-  <macrodef name="install.v4">
-    <attribute name="bundle.url"/>
-    <sequential>
-
-      <!-- 
-           Download the bundle from the appropriate URL, only if it is newer than the one
-           in ${java.io.tmpdir}.  Added a skip.v4.get property since users may want to keep using the
-           V4 bundle in their tmp directory even though a newer version may be available.
-           Usage example:
-             ant -f install_sjsas.xml -Dskip.v4.get=true install.v4.nightly
-      -->
-        <if>
-          <not><isset property="skip.v4.get"/></not>
-      <then>
-        <get src="@{bundle.url}" dest="${temp.dir}/${v4.filename}"
-             usetimestamp="true" verbose="${get.verbose}"/>
-      </then>
-      </if>
-        
-      <!--
-           Use a propregex here to peel off the glassfishv4/glassfish from the end
-           of the specified install.dir.  This is useful if the install.dir is pulled from
-           the ts.jte property javaee.home.ri.  Since javaee.home will end with
-           glassfish4/glassfish.  This is the directory structure created when the
-           platform independent zip is unzipped. So if users use the javaee.home.ri property
-           to specify the install.dir they will want the glassfishv4/glassfish
-           stripped off the directory where the bundle is unzipped.  If the install.dir
-           does not end in glassfishv4/glassfish it will be left alone.  This will
-           happen when users pass the install.dir property during the ant invocation.
-      -->
-      <!--
-           Change this prop name once the GF 4 bundle updates the base dir of the bundle.
-           The javaee.home.ri prop value in ts.jte should also be updated to glassfish4.
-       -->
-          <property name="v4.install.path" value="glassfish6"/>
-      
-        <propertyregex property="v4.install.dir.norm"
-                       input="${v4.install.dir}"
-                       regexp="(.*)/${v4.install.path}/glassfish"
-                       select="\1"
-                       defaultValue="${v4.install.dir}"/>
-        <property name="v4.installed.dir"
-                  value="${v4.install.dir.norm}/${v4.install.path}/glassfish"/>
-          
-        <!--
-             If the install directory exists, attempt to stop the domain and remove
-             the exisitng directory.
-        -->
-        <if>
-          <available file="${v4.install.dir}" type="dir"/>
-        <then>
-          <echo>Found existing V4 install.  Stopping domain and removing:</echo>
-          <echo>   ${v4.install.dir.norm}/${v4.install.path}</echo>
-          <echo>** PATH passed to exec is "${java.home}/bin:${env.PATH}" **</echo>
-          <stop.v4.domain/>
-          <delete dir="${v4.install.dir.norm}/${v4.install.path}" includeemptydirs="true"/>
-        </then>
-        </if>
-
-        <unzip src="${temp.dir}/${v4.filename}" dest="${v4.install.dir.norm}"/>
-
-          <!-- If this is a continuous hudson build the unzipped bundle will not contain        -->
-          <!-- a glassfishv4 directory, instead the directory where the bundle is unzipped      -->
-          <!-- will contain a glassfish and an mq directory.  In this bundle the javadb         -->
-          <!-- directory is under glassfish so this needs to be moved as well.  To fix this     -->
-          <!-- we create a glassfish4 directory and move the glassfish and mq directories      -->
-          <!-- into the new glassfish4 directory.  We also move the glassfish/javadb directory -->
-          <!-- under glassfish4 as well.  This keeps the resulting directory structure of      -->
-          <!-- all the install tasks uniform.                                                   -->
-          <if>
-          <available file="${v4.install.dir.norm}/glassfish" type="dir"/>
-        <then>
-          <mkdir dir="${v4.install.dir.norm}/${v4.install.path}/javadb"/>
-          <move todir="${v4.install.dir.norm}/${v4.install.path}/javadb">
-            <fileset dir="${v4.install.dir.norm}/glassfish/javadb"/>
-          </move>
-          <mkdir dir="${v4.install.dir.norm}/${v4.install.path}/glassfish"/>
-          <move todir="${v4.install.dir.norm}/${v4.install.path}/glassfish">
-            <fileset dir="${v4.install.dir.norm}/glassfish"/>
-          </move>
-        </then>
-        </if>
-
-          <!-- The web bundles do not have mq in them. -->
-          <if>
-            <available file="${v4.install.dir.norm}/mq" type="dir"/>
-          <then>
-          <mkdir dir="${v4.install.dir.norm}/${v4.install.path}/mq"/>
-          <move todir="${v4.install.dir.norm}/${v4.install.path}/mq">
-            <fileset dir="${v4.install.dir.norm}/mq"/>
-          </move>
-        </then>
-          </if>
-          
-        <!--
-             On Unices, set the execute bit on all scripts that may be used by our TCKs.
-        -->
-        <chmod dir="${v4.installed.dir}/bin"           perm="755" excludes="*.bat"/>
-        <chmod dir="${v4.installed.dir}/../javadb/bin" perm="755" excludes="*.bat"/>
-
-    <!-- There is no mq directory in the web bundles. -->
-          <if>
-            <available file="${v4.installed.dir}/../mq/bin" type="dir"/>
-          <then>
-            <chmod dir="${v4.installed.dir}/../mq/bin" perm="755" excludes="*.bat"/>
-          </then>
-          </if>
-          
-          <!-- There is no top level bin directory in the Hudson continuous builds. -->
-          <if> 
-              <available file="${v4.installed.dir}/../bin" type="dir"/>
-          <then>
-          <chmod dir="${v4.installed.dir}/../bin" perm="755" excludes="*.bat"/>
-        </then>
-          </if>
-
-        <!-- Don't delete the downloaded bundle in ${java.io.tmpdir} since we use the timestamp -->
-        <!-- attribute when downloading the bundle.  This way users can reinstall V4 without    -->
-        <!-- redownloading the bundle.  The bundle will only be downloaded when there is a      -->
-        <!-- version available that is newer than the one in ${java.io.tmpdir}                  -->
-
-        <!-- Set the admin port in the domain.xml file using a sed like command.  Doing this -->
-        <!-- step here may keep us from having to use the silent install. This allows us to  -->
-        <!-- use the platform agnostic bundle as well cleaning up the overhead associated    -->
-        <!-- with using the silent install feature, such as managing state files and finding -->
-        <!-- platform specific binaries.                                                     -->
-        <property name="port.to.use" value="${ri.admin.port}"/>
-        <property name="port.to.find" value="4848"/>
-        <property name ="domain.file"
-                  value="${v4.installed.dir}/domains/domain1/config/domain.xml"/>
-        <loadfile property="domain.file.contents" srcfile="${domain.file}"/>
-        <propertyregex property="port.not.found"
-                       input="${domain.file.contents}"
-                       regexp='port="${port.to.find}"'
-                       replace='port="${port.to.use}"'
-                       defaultvalue="true"/>
-        <if>
-          <istrue value="${port.not.found}"/>
-        <then>
-          <echo>Port ${port.to.find} not found, so admin port not reset in domain.xml.</echo>
-        </then>
-        <else>
-          <echo>Port ${port.to.find} found, reset to ${port.to.use}.</echo>
-          <echo>Backing up ${domain.file}.</echo>
-          <copy file="${domain.file}" tofile="${domain.file}.original" failonerror="false"/>
-          <echo message="${port.not.found}" file="${domain.file}"/>
-          <echo>${domain.file} written to disk.</echo>
-        </else>
-        </if>
-     </sequential>
-    </macrodef>
-	
-	
-	<!-- Installs the continuous integration build of V3 web (Hudson artifact) -->
-	<!-- Useful for people who need the latest build but don't want to         -->
-	<!-- wait for the next nightly to be available.                            -->
-  <target name="install.v3.cont.web">
-    <install.v3 bundle.url="${v3.cont.web.url}"/>
-  </target>
-
-	<!-- Installs the continuous integration build of V3 (Hudson artifact) -->
-	<target name="install.v3.cont">
-    <install.v3 bundle.url="${v3.cont.url}"/>
-  </target>
-
- 	<target name="install.v3.promoted">
-    <install.v3 bundle.url="${promoted.url}"/>
-  </target>
-
-  <target name="install.v3.nightly">
-    <install.v3 bundle.url="${nightly.url}"/>
-  </target>
-
-  <target name="install.v3.web.promoted">
-    <install.v3 bundle.url="${promoted.web.url}"/>
-  </target>
-
-  <target name="install.v3.web.nightly">
-    <install.v3 bundle.url="${nightly.web.url}"/>
-  </target>
-
-  <target name="install.v31.promoted">
-    <install.v3 bundle.url="${v31.promoted.url}" is.v31="true"/>
-  </target>
-
-  <target name="install.v31.nightly">
-    <install.v3 bundle.url="${v31.nightly.url}" is.v31="true"/>
-  </target>
-
-  <target name="install.v31.web.promoted">
-    <install.v3 bundle.url="${v31.promoted.web.url}" is.v31="true"/>
-  </target>
-
-  <target name="install.v31.web.nightly">
-    <install.v3 bundle.url="${v31.nightly.web.url}" is.v31="true"/>
-  </target>
-
-  <target name="install.v311.promoted">
-    <install.v3 bundle.url="${v311.promoted.url}" is.v31="true"/>
-  </target>
-
-  <target name="install.v311.nightly">
-    <install.v3 bundle.url="${v311.nightly.url}" is.v31="true"/>
-  </target>
-
-  <target name="install.v311.web.promoted">
-    <install.v3 bundle.url="${v311.promoted.web.url}" is.v31="true"/>
-  </target>
-
-  <target name="install.v311.web.nightly">
-    <install.v3 bundle.url="${v311.nightly.web.url}" is.v31="true"/>
-  </target>
-
-  <target name="install.v312.promoted">
-    <install.v3 bundle.url="${v312.promoted.url}" is.v31="true"/>
-  </target>
-
-  <target name="install.v312.nightly">
-    <install.v3 bundle.url="${v312.nightly.url}" is.v31="true"/>
-  </target>
-
-  <target name="install.v312.web.promoted">
-    <install.v3 bundle.url="${v312.promoted.web.url}" is.v31="true"/>
-  </target>
-
-  <target name="install.v312.web.nightly">
-    <install.v3 bundle.url="${v312.nightly.web.url}" is.v31="true"/>
-  </target>
-
-  <target name="install.v32.promoted">
-    <install.v3 bundle.url="${v32.promoted.url}" is.v31="true"/>
-  </target>
-
-  <target name="install.v32.nightly">
-    <install.v3 bundle.url="${v32.nightly.url}" is.v31="true"/>
-  </target>
-
-  <target name="install.v32.web.promoted">
-    <install.v3 bundle.url="${v32.promoted.web.url}" is.v31="true"/>
-  </target>
-
-  <target name="install.v32.web.nightly">
-    <install.v3 bundle.url="${v32.nightly.web.url}" is.v31="true"/>
-  </target>
-	
-  <target name="install.v4.promoted">
-    <install.v4 bundle.url="${v4.promoted.url}"/>
-  </target>
-
-  <target name="install.v4.nightly">
-    <install.v4 bundle.url="${v4.nightly.url}"/>
-  </target>
-
-  <target name="install.v4.promoted.owan">
-    <install.v4 bundle.url="${v4.promoted.url.owan}"/>
-  </target>
-
-  <target name="install.v4.nightly.owan">
-    <install.v4 bundle.url="${v4.nightly.url.owan}"/>
-  </target>
-
-  <target name="install.v4.web.promoted">
-    <install.v4 bundle.url="${v4.promoted.web.url}"/>
-  </target>
-
-  <target name="install.v4.web.nightly">
-    <install.v4 bundle.url="${v4.nightly.web.url}"/>
-  </target>
-
-  <target name="install.v401.promoted">
-    <install.v4 bundle.url="${v401.promoted.url}"/>
-  </target>
-
-  <target name="install.v401.nightly">
-    <install.v4 bundle.url="${v401.nightly.url}"/>
-  </target>
-
-  <target name="install.v401.promoted.owan">
-    <install.v4 bundle.url="${v401.promoted.url.owan}"/>
-  </target>
-
-  <target name="install.v401.nightly.owan">
-    <install.v4 bundle.url="${v401.nightly.url.owan}"/>
-  </target>
-
-  <target name="install.v401.web.promoted">
-    <install.v4 bundle.url="${v401.promoted.web.url}"/>
-  </target>
-
-  <target name="install.v401.web.nightly">
-    <install.v4 bundle.url="${v401.nightly.web.url}"/>
-  </target>	
-	
-  <target name="remove.v3.bundle">
-    <delete file="${temp.dir}/${v3.filename}" quiet="true"/>
-  </target>
-
-  <target name="remove.v31.bundle">
-    <antcall target="remove.v3.bundle"/>
-  </target>
-
-  <target name="remove.v311.bundle">
-    <antcall target="remove.v3.bundle"/>
-  </target>
-
-  <target name="remove.v312.bundle">
-    <antcall target="remove.v3.bundle"/>
-  </target>
-	
-  <target name="remove.v32.bundle">
-    <antcall target="remove.v3.bundle"/>
-  </target>
-
-  <target name="remove.v4.bundle">
-    <delete file="${temp.dir}/${v4.filename}" quiet="true"/>
-  </target>
-
-  <target name="remove.v401.bundle">
-    <antcall target="remove.v4.bundle"/>
-  </target>
-
-  <target name="do.nothing">
-  	<echo>This job does nothing.  Used as a kludge for skipping the V3 install.</echo>
-  	<echo>This is just easier than changing the Hudson build job sequence.</echo>
-  </target>
-
-</project>
diff --git a/bin/xml/impl/glassfish/jersey.xml b/bin/xml/impl/glassfish/jersey.xml
deleted file mode 100644
index 64d064cc87..0000000000
--- a/bin/xml/impl/glassfish/jersey.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<!--
-
-    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
-
--->
-
-<project name="Jersey/GlassFish package and deploy" default="deploy">
-
-    <!--
-    JAX-RS TCK package target: package JAX-RS TCK test application into web archive
-
-    resource.classes:  specified in individual test's build.xml,
-                       contains all resource class used in the test
-    app.name:          specified in individual test's build.xml,
-                       is used for web archive name: ${app.name}_web.war
-                       is also used in web application's context root:
-                       ${app.name}_web
-    web.xml:           located in individual test's directory.
-                       Is web application's deployment descriptor.
-    class.dir:         TCK's class directory.  Located at $TS_HOME/classes
-    servlet_adaptor:   specified in $TS_HOME/bin/ts.jte.
-                       Required by JAX-RS specification to run in servlet container,
-                       it is imeplementation specific.
-    appconfig.class:   specified in individual test's build.xml.
-                       Required by JAX-RS spec to list all resources in the test application.
-    -->
-
-    <!--
-    JAX-RS TCK deploy target: Deploy JAX-RS web archive
-
-    webapp.dir:  autodeploy directory for web application
-    -->
-    <import file="../../ts.top.import.xml"/>
-
-    <target name="pre.deploy">
-        <fileset id="all.jaxrs.src.dirs" dir="${ts.home}/src" includes="**/web.xml.template"/>        
-        <property name="prop.all.jaxrs.src.dirs" refid="all.jaxrs.src.dirs"/>
-        <propertyregex property="all.jaxrs.tests.dir"
-                  input="${prop.all.jaxrs.src.dirs}"
-                  regexp="[\/|\\]web.xml.template"
-                  replace=""
-                  casesensitive="false" />
-        <!-- It seems the separator can be != path.separator -->
-        <propertyregex property="all.jaxrs.tests.dir.correct.separator"
-                  input="${all.jaxrs.tests.dir}"
-                  regexp=";"
-                  replace="${path.separator}"
-                  casesensitive="false" />                               
-        <foreach list="${all.jaxrs.tests.dir.correct.separator}"
-                 delimiter="${path.separator}"
-                 target="all_action"
-                 param="pkg.dir"/>
-    </target>
-
-    <target name="check.web.xml" >
-        <available file="${ts.home}/src/${pkg.dir}/web.xml.template" property="exist.web.xml"/>
-    </target>
-    
-    <target name="all_action" depends="update_servlet_adaptor,copywar"/>
-
-    <target name="update_servlet_adaptor" depends="check.web.xml" if="exist.web.xml">
-        <!--
-        Create implementation specific web with servlet information
-        -->
-        <copy file="${ts.home}/src/${pkg.dir}/web.xml.template" tofile="${ts.home}/dist/${pkg.dir}/web.xml.${jaxrs_impl_name}"/>
-        <propertyregex property="servlet_adaptor_class"
-                       input="${servlet_adaptor}"
-                       regexp="/"
-                       replace="."/>
-        <propertyregex property="servlet_adaptor_class.1"
-                       input="${servlet_adaptor_class}"
-                       regexp=".class$"
-                       replace=""/>
-        <replace file="${ts.home}/dist/${pkg.dir}/web.xml.${jaxrs_impl_name}" value="${servlet_adaptor_class.1}">
-            <replacetoken>servlet_adaptor</replacetoken>
-        </replace>
-
-        <!--
-        Create implementation specfic war files with
-            updated web.xml;
-            servlet class;
-        -->
-        
-        <antcall target="updatewar"/>
-    </target>
-    
-    <target name="get.app.name">
-        <fileset id="dist.contents" dir="${ts.home}/dist/${pkg.dir}" includes="jaxrs*.war.template"/>
-        <property name="prop.dist.contents" refid="dist.contents"/>
-        <propertyregex property="app.name"
-                       input="${prop.dist.contents}"
-                       regexp="_web.war.template$"
-                       replace=""/>    
-    </target>
-    
-    <target name="updatewar" depends="get.app.name" if="app.name">
-        <!-- Copy web.war.template to web.war.jersey -->
-        <jar destfile="${ts.home}/dist/${pkg.dir}/${app.name}_web.war.${jaxrs_impl_name}">
-            <zipfileset src="${ts.home}/dist/${pkg.dir}/${app.name}_web.war.template" 
-                        excludes="WEB-INF/web.xml"/>
-        </jar>
-        <!-- Copy web.xml to web.war.jersey -->
-        <jar destfile="${ts.home}/dist/${pkg.dir}/${app.name}_web.war.${jaxrs_impl_name}" update="true">    
-            <zipfileset dir="${ts.home}/dist/${pkg.dir}"
-                        includes="web.xml.${jaxrs_impl_name}"
-                        fullpath="WEB-INF/web.xml"/>
-        </jar>
-        <copy failonerror="false"
-              file="${dist.dir}/${pkg.dir}/${app.name}_web.war.${jaxrs_impl_name}"
-              tofile="${dist.dir}/${pkg.dir}/${app.name}_web.war" />    
-    </target>
-    
-    <!-- for 3.0 servlet wars without web.xml -->
-    <target name="copywar" depends="check.web.xml,get.app.name" if="app.name" unless="exist.web.xml">
-        <copy failonerror="false"
-              file="${dist.dir}/${pkg.dir}/${app.name}_web.war.template"
-              tofile="${dist.dir}/${pkg.dir}/${app.name}_web.war" />    
-    </target>    
-</project>
diff --git a/bin/xml/impl/glassfish/s1as.xml b/bin/xml/impl/glassfish/s1as.xml
deleted file mode 100644
index 926d9026f7..0000000000
--- a/bin/xml/impl/glassfish/s1as.xml
+++ /dev/null
@@ -1,1272 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
-    Copyright (c) 2018, 2020 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
-
--->
-
-<project name="CTS Glassfish AppServer configuration" basedir="." default="usage">
-
-    <import file="./common.xml"/>
-    <import file="./deploy.xml"/>
- 
-    <property name="admin.user"      value="${s1as.admin.user}"/>
-    <property name="admin.password"  value="${s1as.admin.passwd}" />
-    <property name="server.host"     value="${s1as.admin.host}"/>
-    <property name="server.port"     value="${s1as.admin.port}"/>
-    <property name="server.orb.port" value="${orb.port}"/>
-    <property name="cli.path"        value="${s1as.admin}"/>
-    <property name="imqbin.loc"      value="${s1as.imqbin.loc}"/>
-    <property name="server.domain.name" value="${s1as.domain.name}"/>
-    <property name="server.domain"   value="${s1as.domain}"/>
-    <property name="server.instance" value="${s1as.server}"/>
-    <property name="server.config.dir" 	value="config"/>
-    <property name="server.home"     value="${javaee.home}"/>
-    <property name="drive"           value="${s1as.applicationRoot}"/>
-    <property name="start.index"     value="16"/>
-    <property name="custom.resource.jndi.name" value="custom/dog"/>
-
-    <var name="use.derby.dbName" value="${derby.dbName}"/>
-    <var name="use.derby.server" value="${derby.server}"/>
-    <var name="use.derby.port" value="${derby.port}"/>
-    <var name="use.derby.user" value="${derby.user}"/>
-    <var name="use.derby.passwd" value="${derby.passwd}"/>
-    <var name="use.derby.url" value="${derby.url}"/>
-    <var name="use.derby.driver" value="${derby.driver}"/>
-    <var name="use.derby.system.home" value="${derby.system.home}"/>
-    <var name="use.derby.classpath" value="${derby.classpath}"/>
-    <var name="use.derby.classes" value="${derby.classes}"/>
-    <var name="use.derby.poolName" value="${derby.poolName}"/>
-    <var name="use.derby.dataSource" value="${derby.dataSource}"/>
-    <var name="use.derby.properties" value="${derby.properties}"/>
-    <var name="use.derby.startup.delay" value="${derby.startup.delay}"/>
-
-    <var name="use.jdbc.poolName" value="${jdbc.poolName}"/>
-    <var name="use.jdbc.maxpoolsize" value="${jdbc.maxpoolsize}"/>
-    <var name="use.jdbc.steadypoolsize" value="${jdbc.steadypoolsize}"/>
-
-    <property name="deploy.dir"      value="${impl.vi.deploy.dir}/"/>
-
-   <!--
-     Install the EE 6.0 RI also known as GlassFish V3.
-   -->
-   <property name="v3.version" value="nightly"/>
-   <property name="remove.v3.bundle" value="false"/>
-   <target name="install.v3">
-     <if>
-         <istrue value="${remove.v3.bundle}"/>
-       <then>
-         <ant antfile="${common.bin.dir}/xml/install_sjsas.xml" target="remove.v3.bundle"/>         
-       </then>
-     </if>
-     <if>
-         <equals arg1="${v3.version}" arg2="nightly"/>
-       <then>
-         <ant antfile="${common.bin.dir}/xml/install_sjsas.xml" target="install.v3.nightly"/>
-       </then>
-       <else>
-         <ant antfile="${common.bin.dir}/xml/install_sjsas.xml" target="install.v3.promoted"/>
-       </else>
-     </if>
-   </target>
-
-
-   <!--
-     For Java EE 5, PE 9.0 = GlassFish = Java EE RI.  This is why the install.ri.*
-     targets simply invoke the install.pe.* targets.
-   -->
-
-   <target name="install.ri.nightly">
-     <antcall target="install.pe.nightly"/>
-   </target>
-
-   <target name="install.ri.promoted">
-     <antcall target="install.pe.promoted"/>
-   </target>
-
-   <target name="install.ri.bundle">
-     <antcall target="install.pe.bundle"/>
-   </target>
-
-   <target name="install.ri">
-     <antcall target="install.pe"/>
-   </target>
-
-   <target name="install.pe.nightly">
-     <property name="sjsas.platform" value="SJSAS_PE"/>
-     <property name="begin.done.tag" value="Sun GlassFish Enterprise Server"/>
-     <ant antfile="${common.bin.dir}/xml/install_sjsas.xml" target="nightly"/>
-   </target>
-
-   <target name="install.pe.promoted">
-     <property name="sjsas.platform" value="SJSAS_PE"/>
-     <property name="begin.done.tag" value="Sun GlassFish Enterprise Server"/>
-     <ant antfile="${common.bin.dir}/xml/install_sjsas.xml" target="promoted"/>
-   </target>
-
-   <target name="install.pe.bundle">
-     <property name="sjsas.platform" value="SJSAS_PE"/>
-     <property name="begin.done.tag" value="Sun GlassFish Enterprise Server"/>
-     <ant antfile="${common.bin.dir}/xml/install_sjsas.xml" target="bundle"/>
-   </target>
-
-   <target name="install.pe">
-     <property name="sjsas.platform" value="SJSAS_PE"/>
-     <property name="begin.done.tag" value="Sun GlassFish Enterprise Server"/>
-     <ant antfile="${common.bin.dir}/xml/install_sjsas.xml" target="install"/>
-   </target>
-
-   <target name="install.ee.nightly">
-     <property name="sjsas.platform" value="SJSAS_EE"/>
-     <property name="filter.value" value="pe"/>
-     <ant antfile="${common.bin.dir}/xml/install_sjsas.xml" target="nightly"/>
-   </target>
-
-   <target name="install.ee.promoted">
-     <property name="sjsas.platform" value="SJSAS_EE"/>
-     <property name="filter.value" value="pe"/>
-     <ant antfile="${common.bin.dir}/xml/install_sjsas.xml" target="promoted"/>
-   </target>
-
-   <target name="install.ee.bundle">
-     <property name="sjsas.platform" value="SJSAS_EE"/>
-     <property name="filter.value" value="pe"/>
-     <ant antfile="${common.bin.dir}/xml/install_sjsas.xml" target="bundle"/>
-   </target>
-
-   <target name="install.ee">
-     <property name="sjsas.platform" value="SJSAS_EE"/>
-     <property name="filter.value" value="pe"/>
-     <ant antfile="${common.bin.dir}/xml/install_sjsas.xml" target="install"/>
-   </target>
-
-   <target name="usage">
-        <echo message="The following ant task are available to configure Glassfish Appserver for CTS:"/>
-        <echo message="ant -f s1as.xml task"/>
-        <echo message=""/>
-        <echo message="The primary tasks are:"/>
-        <echo message=""/>
-        <echo message="clean.s1as (except JMS resources)" />
-        <echo message="cleanall.s1as" />
-        <echo message="config.s1as(except JMS resources)" />
-        <echo message="configall.s1as" />
-        <echo message="enable.security" />
-        <echo message="disable.security" />
-        <echo message="enable.jms" />
-        <echo message="disable.jms" />
-        <echo message="install.jdbc.drivers" />
-   
-        <echo message=""/>
-        <echo message="Additional tasks are:"/>
-        <echo message=""/>
-        <echo message="concat.security" />
-        <echo message="copy.cts.jars" />
-        <echo message="add.cts.users" />
-        <echo message="drop.cts.users" />
-        <echo message="add.javamail.resources" />
-        <echo message="drop.javamail.resources" />
-        <echo message="add.custom.resource" />
-        <echo message="drop.custom.resource" />
-        <echo message="add.jvm.options" />
-        <echo message="drop.jvm.options" />
-        <echo message="add.jdbc.pools" />
-        <echo message="drop.jdbc.pools" />
-        <echo message="list.jdbc.pools" />
-        <echo message="add.jdbc.resources" />
-        <echo message="drop.jdbc.resources" />
-        <echo message="modify.jdbc.resources" />
-        <echo message="add.classpathsuffix" />
-        <echo message="drop.classpathsuffix" />
-        <echo message="add.ssl.client.config" />
-        <echo message="drop.ssl.client.config" />
-        <echo message="set.http.ports" />
-        <echo message="set.orbport" />
-        <echo message="enable.tx.interop" />
-        <echo message="disable.tx.interop" />
-        <echo message="delete.tx.interop" />
-        <echo message="enable.wss.providers" />
-        <echo message="disable.wss.providers" />
-    </target>
-
-    <!-- Configure the OS specific properties based on the OS
-         is being utilized.
-     -->
-    <target name="configPlatform"
-           depends="checkPlatform, configUnix, configWindows, convertPaths">
-
-      <!-- Check if we need to set jvm options -->
-
-      <condition property="jvm.args.set">
-        <not>
-          <equals arg1="" arg2="${s1as.jvm.options}" casesensitive="true" trim="true"/>
-        </not>
-      </condition>
-
-      <!-- Check to see if we are using DB2 -->
-      <condition property="using.db2.type2">
-          <contains string="${use.jdbc.poolName}" substring="db2" casesensitive="false"/>
-      </condition>
-
-      <condition property="db2.props.set">
-          <isset property="using.db2.type2"/>
-      </condition>
-
-      <!-- Check to see if we are using Oracle, will be needed in the future -->
-	  <!--
-      <condition property="using.oracle.type2">
-          <contains arg1="${jdbc.poolName}" arg2="XXX" casesensitive="false" trim="true"/>
-      </condition>
-	  -->
-
-      <!-- The datasource and properties to be used for the non-tx
-            database pool.  See the jdbc.db property in the ts.jte for
-            more details.
-      -->
-      <propertycopy name="jdbc.dataSource" from="${jdbc.db}.dataSource" silent="true"/>
-      <propertycopy name="jdbc.properties" from="${jdbc.db}.properties" silent="true"/>
-    </target>
-
-    <!-- Convert the paths to dos/unix as needed -->
-    <target name="convertPaths" >
-        <translatepath escape="no" propname="s1as.asenv.loc"/>
-
-        <path id="foo3">
-            <pathelement location="${server.domain}" />
-        </path>
-        <pathconvert targetos="${os}" property="domain.path"
-                     refid="foo3"
-                     dirsep="${dir.sep}" >
-        </pathconvert>
-    </target>
-
-    <!--
-       clean.s1as removes all of the configuration settings required by
-       cts.  Note this does not remove the JMS resources.
-    -->
-    <target name="clean.s1as" 
-           depends= "drop.cts.users, drop.javamail.resources, drop.jdbc.resources, drop.jdbc.pools, 
-                    drop.jvm.options, drop.classpathsuffix, drop.certs, 
-                    drop.ssl.client.config, unconfig.jpa, delete.provider.jar, drop.custom.resource" />
-
-    <!--
-       cleanall.s1as removes all of the configuration settings required by
-       cts.  Note this does not remove the JMS resources.
-    -->
-    <target name="cleanall.s1as" 
-           depends= "clean.s1as, disable.jms" />
-
-    <!--
-       config.s1as configures all of the S1AS settings required by
-       cts.  Note this does not configure the JMS and security resources.
-    -->
-    <target name="config.s1as" 
-           depends= "start.appserver, change.applicationRoot, copy.provider.jar, config.jpa, 
-                    add.cts.users, add.javamail.resources, add.jdbc.pools, 
-                    add.jdbc.resources,  drop.jvm.options, add.jvm.options, add.classpathsuffix,  
-                    set.http.ports, set.orbport, create.asadmin.bat, concat.security, add.cert, 
-                    add.custom.resource, enable.trace" />
-
-    <!--
-       configall.s1as configures all of the S1AS settings required by
-       cts. 
-    -->
-    <target name="configall.s1as" 
-           depends= "config.s1as, enable.jms" />
-
-    <!--
-       copy.provider.jar copies the provider jar files to the instance lib directory.
-    -->
-    <target name="copy.provider.jar">
-        <copy file="${ts.home}/lib/tsprovider.jar" tofile="${javaee.home}/lib/tsprovider.jar" overwrite="yes" />
-    </target>
-    <target name="delete.provider.jar">
-       <delete file="${javaee.home}/lib/tsprovider.jar" quiet="true"/>
-    </target>
-
-    <!--
-      add.jvm.options installs the jvm options defined in the build.properties
-      file.   
-    -->
-    <target name="add.jvm.options" depends="configPlatform" if="jvm.args.set">
-         <antcall target="create-jvm-options" >
-          <param name="jvm.options" value="${s1as.jvm.options}"/>
-         </antcall>
-
-         <!-- add call to set jvm option for use by interop-csiv2 loggerServlet -->
-         <antcall target="create-one-jvm-option" >
-            <param name="jvm.options" value=" -Dri.log.file.location=${ri.log.file.location}"/>
-         </antcall>
-
-    </target>
-
-    <!--
-      drop.jvm.options removes the jvm options that have been previously set.
-    -->
-    <target name="drop.jvm.options" depends="configPlatform" if="jvm.args.set">
-
-         <antcall target="delete-jvm-options" >
-          <param name="jvm.options" value=" ${s1as.jvm.options.remove}"/>
-         </antcall>
-
-         <antcall target="delete-one-jvm-option" >
-            <param name="jvm.options" value=" -Dri.log.file.location=${ri.log.file.location}"/>
-         </antcall>
-
-         <antcall target="delete.tx.interop"/>
-    </target>
-
-    <!--
-      add.classpathsuffix adds the classpath settings as defined in 
-      build.properties.
-
-     The path is converted to correctly reflect the OS that ant is being
-     executed on.
-    -->
-    <target name="add.classpathsuffix" depends="configPlatform" >
-         <antcall target="set" >
-          <param name="set.value" value=" ${server.instance}-config.java-config.classpath_suffix=${s1as.classpathsuffix}"/>
-         </antcall>
-    </target>
-
-    <!--
-      add.cts.users configures the users required by cts.
-    -->
-    <target name="add.cts.users" depends="configPlatform, determine.jmsServer">
-         <antcall target="create-file-user" >
-          <param name="userpassword" value="j2ee"/>
-          <param name="usergroups" value="staff:mgr:asadmin"/>
-          <param name="userName" value="j2ee"/>
-         </antcall>
-         <antcall target="create-file-user" >
-          <param name="userpassword" value="javajoe"/>
-          <param name="usergroups" value="guest"/>
-          <param name="userName" value="javajoe"/>
-         </antcall>
-         <antcall target="create-file-user" >
-          <param name="userpassword" value="j2ee_vi"/>
-          <param name="usergroups" value="staff"/>
-          <param name="userName" value="j2ee_vi"/>
-         </antcall>
-    	<!--
-    	  There is no MQ in the web bundle so skip adding the JMS users unless
-    	  we are running against a full EE impl.
-    	-->
-    	<if>
-    	  <contains string="${javaee.level}" substring="full"/>
-    	<then>
-         <antcall target="create-jms-user" >
-          <param name="jmsServer" value="${jmsServer}"/>
-          <param name="userName" value="j2ee"/>
-          <param name="userPassword" value="j2ee"/>
-          <param name="userGroup" value="admin"/>
-         </antcall>
-         <antcall target="create-jms-user" >
-          <param name="jmsServer" value="${jmsServer}"/>
-          <param name="userName" value="javajoe"/>
-          <param name="userPassword" value="javajoe"/>
-          <param name="userGroup" value="admin"/>
-         </antcall>
-       </then>
-       <else>
-         <echo>******************************************</echo>
-         <echo>WEB PROFILE in use, JMS Users NOT Created.</echo>
-         <echo>******************************************</echo>
-       </else>
-       </if>
-    </target>
-
-    <!--
-      drop.cts.users removes the users required by cts.
-    -->
-    <target name="drop.cts.users" depends="configPlatform,determine.jmsServer">
-         <antcall target="delete-file-user" >
-          <param name="userName" value="j2ee"/>
-         </antcall>
-         <antcall target="delete-file-user" >
-          <param name="userName" value="javajoe"/>
-         </antcall>
-         <antcall target="delete-file-user" >
-          <param name="userName" value="j2ee_vi"/>
-         </antcall>
-         
-       <if>  
-         <contains string="${javaee.level}" substring="full"/>
-       <then>
-         <antcall target="delete-jms-user" >
-          <param name="jmsServer" value="${jmsServer}"/>
-          <param name="userName" value="j2ee"/>
-          <param name="userPassword" value="j2ee"/>
-          <param name="userGroup" value="admin"/>
-         </antcall>
-         <antcall target="delete-jms-user" >
-          <param name="jmsServer" value="${jmsServer}"/>
-          <param name="userName" value="javajoe"/>
-          <param name="userPassword" value="javajoe"/>
-          <param name="userGroup" value="admin"/>
-         </antcall>
-       </then>
-       <else>         
-         <echo>******************************************</echo>
-         <echo>WEB PROFILE in use, JMS Users NOT Deleted.</echo>
-         <echo>******************************************</echo>
-       </else>
-       </if>
-     </target>
-
-     <!--
-      add.jdbc.pools configures the connection pools defined in the
-      build.properties files.
-     -->
-     <target name="add.jdbc.pools" depends="configPlatform" if="create.jdbc.pools.prop">
-
-         <antcall target="create-jdbc-connection-pool" >
-          <param name="restype" value="javax.sql.DataSource"/>
-          <param name="datasourceclassname" value="${use.derby.dataSource}"/>
-          <param name="pool.properties" value="${use.derby.properties}"/>
-          <param name="poolName" value="${use.derby.poolName}"/>
-         </antcall>
-
-        <antcall target="create-jdbc-connection-pool" >
-          <param name="restype" value="javax.sql.DataSource"/>
-          <param name="datasourceclassname" value="${derbyEmbedded.dataSource}"/>
-          <param name="pool.properties" value="${derbyEmbedded.properties}"/>
-          <param name="poolName" value="${derbyEmbedded.poolName}"/>
-         </antcall>
-
-         <antcall target="create-jdbc-connection-pool" >
-          <param name="restype" value="javax.sql.DataSource"/>
-          <param name="datasourceclassname" value="${pointbase.dataSource}"/>
-          <param name="pool.properties" value="${pointbase.properties}"/>
-          <param name="poolName" value="${pointbase.poolName}"/>
-         </antcall>
-
-         <antcall target="create-jdbc-connection-pool" >
-          <param name="restype" value="javax.sql.XADataSource"/>
-          <param name="datasourceclassname" value="org.apache.derby.jdbc.EmbeddedXADataSource"/>
-          <param name="pool.properties" value="${derbyEmbedded.properties}"/>
-          <param name="poolName" value="${timer.poolName}"/>
-         </antcall>
-
-         <antcall target="create-jdbc-connection-pool" >
-          <param name="restype" value="javax.sql.DataSource"/>
-          <param name="datasourceclassname" value="${mssqlserver.dataSource}"/>
-          <param name="pool.properties" value="${mssqlserver.properties}"/>
-          <param name="poolName" value="${mssqlserver.poolName}"/>
-         </antcall>
-
-         <antcall target="create-jdbc-connection-pool" >
-          <param name="restype" value="javax.sql.DataSource"/>
-          <param name="datasourceclassname" value="${mssqlserverDD.dataSource}"/>
-          <param name="pool.properties" value="${mssqlserverDD.properties}"/>
-          <param name="poolName" value="${mssqlserverDD.poolName}"/>
-         </antcall>
-
-         <antcall target="create-jdbc-connection-pool" >
-          <param name="restype" value="javax.sql.DataSource"/>
-          <param name="datasourceclassname" value="${mssqlserverSun.dataSource}"/>
-          <param name="pool.properties" value="${mssqlserverSun.properties}"/>
-          <param name="poolName" value="${mssqlserverSun.poolName}"/>
-         </antcall>
-
-         <antcall target="create-jdbc-connection-pool" >
-          <param name="restype" value="javax.sql.DataSource"/>
-          <param name="datasourceclassname" value="${mssqlserverInet.dataSource}"/>
-          <param name="pool.properties" value="${mssqlserverInet.properties}"/>
-          <param name="poolName" value="${mssqlserverInet.poolName}"/>
-         </antcall>
-
-         <antcall target="create-jdbc-connection-pool" >
-          <param name="restype" value="javax.sql.DataSource"/>
-          <param name="datasourceclassname" value="${oracleDD.dataSource}"/>
-          <param name="pool.properties" value="${oracleDD.properties}"/>
-          <param name="poolName" value="${oracleDD.poolName}"/>
-         </antcall>
-
-         <antcall target="create-jdbc-connection-pool" >
-          <param name="restype" value="javax.sql.DataSource"/>
-          <param name="datasourceclassname" value="${oracleSun.dataSource}"/>
-          <param name="pool.properties" value="${oracleSun.properties}"/>
-          <param name="poolName" value="${oracleSun.poolName}"/>
-         </antcall>
-
-         <antcall target="create-jdbc-connection-pool" >
-          <param name="restype" value="javax.sql.DataSource"/>
-          <param name="datasourceclassname" value="${oracle.dataSource}"/>
-          <param name="pool.properties" value="${oracle.properties}"/>
-          <param name="poolName" value="${oracle.poolName}"/>
-         </antcall>
-
-         <antcall target="create-jdbc-connection-pool" >
-          <param name="restype" value="javax.sql.DataSource"/>
-          <param name="datasourceclassname" value="${oracleOCI.dataSource}"/>
-          <param name="pool.properties" value="${oracleOCI.properties}"/>
-          <param name="poolName" value="${oracleOCI.poolName}"/>
-         </antcall>
-
-         <antcall target="create-jdbc-connection-pool" >
-          <param name="restype" value="javax.sql.DataSource"/>
-          <param name="datasourceclassname" value="${oracleInet.dataSource}"/>
-          <param name="pool.properties" value="${oracleInet.properties}"/>
-          <param name="poolName" value="${oracleInet.poolName}"/>
-         </antcall>
-
-         <antcall target="create-jdbc-connection-pool" >
-          <param name="restype" value="javax.sql.DataSource"/>
-          <param name="datasourceclassname" value="${sybase.dataSource}"/>
-          <param name="pool.properties" value="${sybase.properties}"/>
-          <param name="poolName" value="${sybase.poolName}"/>
-         </antcall>
-
-         <antcall target="create-jdbc-connection-pool" >
-          <param name="restype" value="javax.sql.DataSource"/>
-          <param name="datasourceclassname" value="${sybaseInet.dataSource}"/>
-          <param name="pool.properties" value="${sybaseInet.properties}"/>
-          <param name="poolName" value="${sybaseInet.poolName}"/>
-         </antcall>
-
-         <antcall target="create-jdbc-connection-pool" >
-          <param name="restype" value="javax.sql.DataSource"/>
-          <param name="datasourceclassname" value="${sybaseDD.dataSource}"/>
-          <param name="pool.properties" value="${sybaseDD.properties}"/>
-          <param name="poolName" value="${sybaseDD.poolName}"/>
-         </antcall>
-
-         <antcall target="create-jdbc-connection-pool" >
-          <param name="restype" value="javax.sql.DataSource"/>
-          <param name="datasourceclassname" value="${sybaseSun.dataSource}"/>
-          <param name="pool.properties" value="${sybaseSun.properties}"/>
-          <param name="poolName" value="${sybaseSun.poolName}"/>
-         </antcall>
-
-         <antcall target="create-jdbc-connection-pool" >
-          <param name="restype" value="javax.sql.DataSource"/>
-          <param name="datasourceclassname" value="${db2.dataSource}"/>
-          <param name="pool.properties" value="${db2.properties}"/>
-          <param name="poolName" value="${db2.poolName}"/>
-         </antcall>
-
-         <antcall target="create-jdbc-connection-pool" >
-          <param name="restype" value="javax.sql.DataSource"/>
-          <param name="datasourceclassname" value="${db2DD.dataSource}"/>
-          <param name="pool.properties" value="${db2DD.properties}"/>
-          <param name="poolName" value="${db2DD.poolName}"/>
-         </antcall>
-
-         <antcall target="create-jdbc-connection-pool" >
-          <param name="restype" value="javax.sql.DataSource"/>
-          <param name="datasourceclassname" value="${db2Sun.dataSource}"/>
-          <param name="pool.properties" value="${db2Sun.properties}"/>
-          <param name="poolName" value="${db2Sun.poolName}"/>
-         </antcall>
-
-         <antcall target="create-jdbc-connection-pool" >
-          <param name="restype" value="javax.sql.DataSource"/>
-          <param name="datasourceclassname" value="${mysql.dataSource}"/>
-          <param name="pool.properties" value="${mysql.properties}"/>
-          <param name="poolName" value="${mysql.poolName}"/>
-         </antcall>
-
-         <antcall target="create-jdbc-connection-pool" >
-          <param name="restype" value="javax.sql.DataSource"/>
-          <param name="datasourceclassname" value="${postgresql.dataSource}"/>
-          <param name="pool.properties" value="${postgresql.properties}"/>
-          <param name="poolName" value="${postgresql.poolName}"/>
-         </antcall>
-
-     </target>
-
-     <!--
-        drop.jdbc.pools remove the connection pools defined in the
-        build.properties files.
-     -->
-     <target name="drop.jdbc.pools" depends="configPlatform" if="create.jdbc.pools.prop">
-
-         <antcall target="delete-jdbc-connection-pool" >
-          <param name="poolName" value="${use.derby.poolName}"/>
-         </antcall>
-         
-         <antcall target="delete-jdbc-connection-pool" >
-          <param name="poolName" value="${derbyEmbedded.poolName}"/>
-         </antcall>
-         <antcall target="delete-jdbc-connection-pool" >
-          <param name="poolName" value="${pointbase.poolName}"/>
-         </antcall>
-         <antcall target="delete-jdbc-connection-pool" >
-          <param name="poolName" value="${timer.poolName}"/>
-         </antcall>
-         <antcall target="delete-jdbc-connection-pool" >
-          <param name="poolName" value="${mssqlserver.poolName}"/>
-         </antcall>
-         <antcall target="delete-jdbc-connection-pool" >
-          <param name="poolName" value="${mssqlserverDD.poolName}"/>
-         </antcall>
-         <antcall target="delete-jdbc-connection-pool" >
-          <param name="poolName" value="${mssqlserverSun.poolName}"/>
-         </antcall>
-         <antcall target="delete-jdbc-connection-pool" >
-          <param name="poolName" value="${mssqlserverInet.poolName}"/>
-         </antcall>
-         <antcall target="delete-jdbc-connection-pool" >
-          <param name="poolName" value="${oracle.poolName}"/>
-         </antcall>
-         <antcall target="delete-jdbc-connection-pool" >
-          <param name="poolName" value="${oracleOCI.poolName}"/>
-         </antcall>
-         <antcall target="delete-jdbc-connection-pool" >
-          <param name="poolName" value="${oracleDD.poolName}"/>
-         </antcall>
-         <antcall target="delete-jdbc-connection-pool" >
-          <param name="poolName" value="${oracleSun.poolName}"/>
-         </antcall>
-         <antcall target="delete-jdbc-connection-pool" >
-          <param name="poolName" value="${oracleInet.poolName}"/>
-         </antcall>
-         <antcall target="delete-jdbc-connection-pool" >
-          <param name="poolName" value="${sybase.poolName}"/>
-         </antcall>
-         <antcall target="delete-jdbc-connection-pool" >
-          <param name="poolName" value="${sybaseInet.poolName}"/>
-         </antcall>
-         <antcall target="delete-jdbc-connection-pool" >
-          <param name="poolName" value="${sybaseDD.poolName}"/>
-         </antcall>
-         <antcall target="delete-jdbc-connection-pool" >
-          <param name="poolName" value="${sybaseSun.poolName}"/>
-         </antcall>
-         <antcall target="delete-jdbc-connection-pool" >
-          <param name="poolName" value="${db2.poolName}"/>
-        </antcall>
-         <antcall target="delete-jdbc-connection-pool" >
-          <param name="poolName" value="${db2DD.poolName}"/>
-        </antcall>
-         <antcall target="delete-jdbc-connection-pool" >
-          <param name="poolName" value="${db2Sun.poolName}"/>
-        </antcall>
-         <antcall target="delete-jdbc-connection-pool" >
-          <param name="poolName" value="${mysql.poolName}"/>
-        </antcall>
-         <antcall target="delete-jdbc-connection-pool" >
-          <param name="poolName" value="${postgresql.poolName}"/>
-        </antcall>
-
-     </target>
-
-     <!--
-       Change the JNDI entries for jdo/pmf, jdbc/DB1, jdbc/DBTimer
-       Modify the classpathsuffix to include the new jdbc drivers.
-     -->
-     <target name= "modify.jdbc.resources" depends="drop.jdbc.resources, add.jdbc.resources, restart.server"/>
-
-     <target name="copy.db2.jars" if="using.db2.type2">
-       <copy todir="${server.domain}/lib/ext" overwrite="yes">
-         <fileset dir="${jdbc.lib.class.path}">
-           <include name="db2*"/>
-         </fileset>
-       </copy>
-     </target>
-
-     <target name="delete.db2.jars" unless="using.db2.type2">
-       <delete quiet="true">
-         <fileset dir="${server.domain}/lib/ext">
-           <include name="db2*"/>
-         </fileset>
-       </delete>
-     </target>
-
-     <!--
-        add.jdbc.resources configures the JNDI resources used by cts to
-        the correct connection pool as defined in the build.properties file.
-
-        Also set the maxPoolSize and steadyPoolSize for the connection pool
-        under test.
-     -->
-     <target name="add.jdbc.resources" depends="configPlatform" if="create.jdbc.pools.prop">
-
-        <antcall target="copy.db2.jars"/>
-        <antcall target="delete.db2.jars"/>
-
-        <antcall target="set" >
-          <param name="set.value" value=" ${resources.dottedname.prefix}.jdbc-connection-pool.${use.jdbc.poolName}.max_pool_size=${use.jdbc.maxpoolsize}"/>
-        </antcall>
-
-        <antcall target="set" >
-          <param name="set.value" value=" ${resources.dottedname.prefix}.jdbc-connection-pool.${use.jdbc.poolName}.steady_pool_size=${use.jdbc.steadypoolsize}"/>
-        </antcall>
-      
-        <antcall target="create-jdbc-resource" >
-          <param name="connectionpoolid" value="${use.jdbc.poolName}"/>
-          <param name="jndiName" value="jdbc/DB1"/>
-        </antcall>
-        
-        <antcall target="create-jdbc-resource" >
-          <param name="connectionpoolid" value="${timer.poolName}"/>
-          <param name="jndiName" value="jdbc/DBTimer"/>
-        </antcall>
-
-        <!-- Start XA Specific Resources. -->
-        <antcall target="create-jdbc-resource" >
-          <param name="connectionpoolid" value="cts-derby-XA-pool"/>
-          <param name="jndiName" value="eis/JDBCwhitebox-xa"/>
-        </antcall>
-
-        <antcall target="create-jdbc-resource" >
-          <param name="connectionpoolid" value="cts-derby-XA-pool"/>
-          <param name="jndiName" value="eis/JDBCwhitebox-tx"/>
-        </antcall>
-
-        <antcall target="create-jdbc-resource" >
-          <param name="connectionpoolid" value="cts-derby-XA-pool"/>
-          <param name="jndiName" value="eis/JDBCwhitebox-notx"/>
-        </antcall>
-        <!-- End XA Specific Resources. -->
-        
-        <antcall target="create-jdbc-connection-pool" >
-          <param name="restype" value="javax.sql.DataSource"/>
-          <param name="datasourceclassname" value="${jdbc.dataSource}"/>
-          <param name="pool.properties" value="${jdbc.properties}"/>
-          <param name="poolName" value="${use.jdbc.poolName}_no_tx"/>
-        </antcall>
-
-        <antcall target="set" >
-          <param name="set.value" value=" ${resources.dottedname.prefix}.jdbc-connection-pool.${use.jdbc.poolName}_no_tx.non-transactional-connections=true"/>
-        </antcall>
-
-        <antcall target="create-jdbc-resource" >
-          <param name="connectionpoolid" value="${use.jdbc.poolName}_no_tx"/>
-          <param name="jndiName" value="jdbc/DB_no_tx"/>
-        </antcall>        
-
-	 <antcall target="create-jdbc-resource" >
-            <param name="connectionpoolid" value="${use.jdbc.poolName}"/>
-            <param name="jndiName" value="jdbc/securityAPIDB"/>
-         </antcall>
-
-     </target>
-
-     <!--
-      drop.jdbc.resources removes the JNDI resources used by cts.
-     -->
-     <target name="drop.jdbc.resources" depends="configPlatform" if="create.jdbc.pools.prop">
-
-         <antcall target="delete-jdbc-resource" >
-          <param name="jndiName" value="jdbc/orderDB"/>
-         </antcall>
-         
-         <antcall target="delete-jdbc-resource" >
-          <param name="jndiName" value="jdbc/DB1"/>
-         </antcall>
-        <antcall target="delete-jdbc-resource" >
-          <param name="jndiName" value="jdbc/DBTimer"/>
-         </antcall>
-
-        <antcall target="delete-jdbc-resource" >
-          <param name="jndiName" value="jdbc/DB_no_tx"/>
-        </antcall>        
-
-        <antcall target="delete-jdbc-connection-pool" >
-          <param name="poolName" value="${use.jdbc.poolName}_no_tx"/>
-        </antcall>
-
-        <!-- Start XA Specific Resources. -->
-        <antcall target="delete-jdbc-resource" >
-          <param name="jndiName" value="eis/JDBCwhitebox-xa"/>
-        </antcall>
-
-        <antcall target="delete-jdbc-resource" >
-          <param name="jndiName" value="eis/JDBCwhitebox-tx"/>
-        </antcall>
-
-        <antcall target="delete-jdbc-resource" >
-          <param name="jndiName" value="eis/JDBCwhitebox-notx"/>
-        </antcall>
-        <!-- End XA Specific Resources. -->
-
-     </target>
-
-
-     <target name="config.connector" >
-       <if>
-           <and>
-                <available file="${ts.home}/src/com/sun/ts/tests/common/connector"/>
-           </and>
-       <then>
-           <ant antfile="${common.bin.dir}/xml/impl/glassfish/connector.xml" target="config.connector"/>
-       </then>
-       </if>
-     </target>
-
- 
-     <!-- 
-       Convenience method to support configuring connector rars, resources, and pools.
-     -->
-     <target name="setup.all.rars.and.pools" depends="configPlatform">
-
-       <ant antfile="${common.bin.dir}/xml/impl/glassfish/connector.xml" target="setup.all.rars.and.pools">
-       </ant>
-
-     </target>
-
-
-     <target name="undeploy.all.rars.and.pools" >
-       <ant antfile="${common.bin.dir}/xml/impl/glassfish/connector.xml" target="undeploy.all.rars.and.pools">
-       </ant>
-     </target>
- 
-
-     <!--
-       Enable all of the required JMS resources  used by cts.
-     -->
-     <target name="enable.jms" depends="configPlatform ">
-       <if>
-         <contains string="${javaee.level}" substring="full"/>
-       <then>
-         <echo message="****server.instance: ${server.instance}"/>
-         <if>
-           <equals arg1="${test.sa.jmsra}" arg2="true"/>
-         <then>
-           <ant antfile="${bin.dir}/xml/impl/glassfish/jmsra.xml" target="doJMSRAConfig"/>
-         </then>
-         <else>
-           <exec executable="${exec.asadmin}" >
-             <env key="AS_ADMIN_USER" value="${s1as.admin.user}"/>
-             <env key="AS_ADMIN_PASSWORDFILE" value="${password.file}"/>
-             <env key="AS_ADMIN_HOST" value="${s1as.admin.host}"/>
-             <env key="AS_ADMIN_PORT" value="${s1as.admin.port}"/>
-             <env key="AS_ADMIN_TARGET" value="${server.instance}"/>
-             <arg line="${exec.asadmin.part2}" />
-             <arg line=" --echo=true "/>
-             <arg line="multimode " />
-             <arg line="--file ${bin.dir}/xml/impl/glassfish/templates/create.jms.template " />
-           </exec>
-         </else>
-         </if>
-       </then>
-       <else>
-         <echo>**********************************************</echo>
-         <echo>WEB PROFILE in use, JMS Resources NOT Created.</echo>
-         <echo>**********************************************</echo>
-       </else>
-       </if>
-     </target>
-
-     <!--
-       Disable all of the required JMS resources  used by cts.
-     -->
-     <target name="disable.jms" depends="configPlatform">
-       <if>
-         <contains string="${javaee.level}" substring="full"/>
-       <then>
-         <echo message="****server.instance: ${server.instance}"/>
-         <if>
-           <equals arg1="${test.sa.jmsra}" arg2="true"/>
-         <then>
-           <ant antfile="${bin.dir}/xml/impl/glassfish/jmsra.xml" target="doJMSRAUnconfig"/>
-         </then>
-         <else>
-           <exec executable="${exec.asadmin}" >
-             <env key="AS_ADMIN_USER" value="${s1as.admin.user}"/>
-             <env key="AS_ADMIN_PASSWORDFILE" value="${password.file}"/>
-             <env key="AS_ADMIN_HOST" value="${s1as.admin.host}"/>
-             <env key="AS_ADMIN_PORT" value="${s1as.admin.port}"/>
-             <env key="AS_ADMIN_TARGET" value="${server.instance}"/>
-             <arg line="${exec.asadmin.part2}" />
-             <arg line=" --echo=true "/>
-             <arg line="multimode " />
-             <arg line="--file ${bin.dir}/xml/impl/glassfish/templates/delete.jms.template " />
-           </exec>
-         </else>
-         </if>
-       </then>
-       <else>
-         <echo>**********************************************</echo>
-         <echo>WEB PROFILE in use, JMS Resources NOT Deleted.</echo>
-         <echo>**********************************************</echo>
-       </else>
-       </if>
-     </target>
-
-     <!--
-       add.javamail.resources configures the javamail JNDI resources 
-       required by cts.
-     -->
-     <target name="add.javamail.resources" depends="configPlatform">
-         <antcall target="create-mail-resource" >
-          <param name="jndiName" value=" mail/Session"/>
-         </antcall>
-     </target>
-	
-	 <target name="populateMailbox">
-	     <ant antfile="${src.dir}/com/sun/ts/tests/javamail/ee/util/build.xml" target="populateMailbox"/>
-	 </target>
-
-     <!--
-       drop.javamail.resources removes the javamail JNDI resources 
-       required by cts.
-     -->
-     <target name="drop.javamail.resources" depends="configPlatform">
-         <antcall target="delete-mail-resource" >
-          <param name="jndiName" value=" mail/Session"/>
-         </antcall>
-     </target>
-	
-    <target name="clearMailbox">
-    	<ant antfile="${src.dir}/com/sun/ts/tests/javamail/ee/util/build.xml" target="clearMailbox"/>
-    </target>
-
-     <!--
-       Remove the custom resources
-     -->
-     <target name="drop.custom.resource" depends="configPlatform">
-        <exec executable="${exec.asadmin}" >
-            <arg line="${exec.asadmin.part2}" />
-            <arg line=" --user ${admin.user}"/>
-            <arg line=" --passwordfile ${password.file}"/>
-            <arg line=" --host ${server.host}"/>
-            <arg line=" --port ${server.port}"/>
-            <arg line=" delete-custom-resource"/>
-            <arg line=" ${custom.resource.jndi.name}"/>
-        </exec>
-     </target>
-
-     <!--
-       Add the custom resources
-     -->
-     <target name="add.custom.resource" depends="configPlatform">
-        <exec executable="${exec.asadmin}" >
-            <arg line="${exec.asadmin.part2}" />
-            <arg line=" --user ${admin.user}"/>
-            <arg line=" --passwordfile ${password.file}"/>
-            <arg line=" --host ${server.host}"/>
-            <arg line=" --port ${server.port}"/>
-            <arg line=" create-custom-resource"/>
-            <arg line=" --restype com.sun.ts.lib.deliverable.cts.resource.Dog"/>
-            <arg line=" --factoryclass com.sun.ts.lib.deliverable.cts.resource.DogFactory"/>
-            <arg line=" ${custom.resource.jndi.name}"/>
-        </exec>
-     </target>
-
-      <!--
-         Set the ORB port by calling the correct target based on whether
-         we are configuring PE or EE.
-     -->
-     <target name="set.orbport">
-        <antcall target="set.orbport.pe"/>
-        <antcall target="set.orbport.ee"/>
-     </target>
-
-      <!--
-         Set the HTTP ports by calling the correct target based on whether
-         we are configuring PE or EE.
-     -->
-     <target name="set.http.ports">
-        <antcall target="set.http.ports.pe"/>
-        <antcall target="set.http.ports.ee"/>
-     </target>
-
-     <!--
-      set.orbport configures the orb port  for PE required by cts.
-     -->
-     <target name="set.orbport.pe" depends="configPlatform" unless="use.create.system.properties">
-         <antcall target="set" >
-          <param name="set.value" value=" ${server.instance}-config.iiop-service.iiop-listener.${instance.listenerName}.port=${server.orb.port}"/>
-         </antcall>
-     </target>
-     
-     <!--
-       set the http listener ports for PE
-     -->
-     <target name="set.http.ports.pe" depends="configPlatform"  unless="use.create.system.properties">
-         <antcall target="set" >
-          <param name="set.value" value=" ${server.instance}-config.network-config.network-listeners.network-listener.http-listener-1.port=${webServerPort}"/>
-         </antcall>
-     	
-         <antcall target="set" >
-          <param name="set.value" value=" ${server.instance}-config.network-config.network-listeners.network-listener.http-listener-2.port=${securedWebServicePort}"/>
-         </antcall>
-
-         <antcall target="set" >
-          <param name="set.value" value=" ${server.instance}-config.network-config.network-listeners.network-listener.http-listener-2.enabled=true"/>
-         </antcall>
-     </target>
-
-
-     <!--
-          Set the ORB port for SE/EE by updating the correct System Property
-     -->
-     <target name="set.orbport.ee" depends="configPlatform" if="use.create.system.properties">
-         <antcall target="create-system-properties" >
-          <param name="property" value=" IIOP_LISTENER_PORT=${server.orb.port}"/>
-          <param name="instance.name" value=" ${server.instance}-config"/>
-         </antcall>
-     </target>
-
-     <!--
-          Set the http ports for SE/EE by updating the correct System Properties
-     -->
-     <target name="set.http.ports.ee" depends="configPlatform" if="use.create.system.properties">
-         <antcall target="create-system-properties" >
-          <param name="property" value=" HTTP_LISTENER_PORT=${webServerPort}"/>
-          <param name="instance.name" value=" ${server.instance}-config"/>
-         </antcall>
-
-         <antcall target="create-system-properties" >
-          <param name="property" value=" HTTP_SSL_LISTENER_PORT=${securedWebServicePort}"/>
-          <param name="instance.name" value=" ${server.instance}-config"/>
-         </antcall>
-     </target>
-
-    <property name="ant.opts" value=""/>
-    <property name="run.client.args" value=""/>
-    <property name="buffering.enabled" value="false"/>
-    <property name="test.areas" value="appclient, connector, jaxws, jstl,
-                                       samples, webservices12, assembly, ejb,
-                                       jdbc, jta, servlet, ejb30, javamail, jms,
-                                       jws, signaturetest, xa, integration,
-                                       jsf, 
-                                       jsp, saaj"/>
-    
-    <!-- timeout is specified in seconds, default is 3 minutes -->
-    <property name="jointimeout" value="180"/>
-    <property name="deliverabledir" value="j2ee"/>
-    <property name="buildJwsJaxws" value="true"/>
-    <property name="skip.server.restart" value="false"/>
-
-    <target name="run.cts">
-      <runcts runclientargs="${run.client.args}"
-              buildJwsJaxws="${buildJwsJaxws}"
-              reportdir="${report.dir}"
-              workdir="${work.dir}"
-              tshome="${ts.home}"
-              j2eehome="${javaee.home}"
-              testareas="${test.areas}"
-              jointimeout="${jointimeout}"
-              antopts="${ant.opts}"
-              deliverabledir="${deliverabledir}"
-              bufferingenabled="${buffering.enabled}"
-              skipserverrestart="${skip.server.restart}"/>
-    </target>
-
-    <target name="backup.ts.jte.file" unless="ts.jte.backed">
-       <copy file="${bin.dir}/ts.jte" tofile="${bin.dir}/ts.jte.original"/>
-    </target>
-
-    <target name="backup.domain.xml.file" unless="domain.xml.backed">
-        <copy file="${bin.dir}/build.xml" tofile="${bin.dir}/build.xml.original"/>       
-    </target>
-
-    <target name="config.cts.jcov">
-       <available file="${bin.dir}/ts.jte.original" property="ts.jte.backed"/>
-       <antcall target="backup.ts.jte.file"/>
-       <available file="${bin.dir}/build.xml.original" property="domain.xml.backed"/>
-       <antcall target="backup.domain.xml.file"/>
-       <configctsjcov tshome="${ts.home}" j2eehome="${javaee.home}"/>
-    </target>
-
-    <target name="config.cts.emma">
-       <available file="${bin.dir}/ts.jte.original" property="ts.jte.backed"/>
-       <antcall target="backup.ts.jte.file"/>
-       <available file="${bin.dir}/build.xml.original" property="domain.xml.backed"/>
-       <antcall target="backup.domain.xml.file"/>
-       <configctsemma tshome="${ts.home}" j2eehome="${javaee.home}"/>
-    </target>
-
-    <!--  
-         Determine if we are running PE, SE or the EE.
-         We will then set the correct jmsServer value to use
-    -->
-
-    <target name="determine.jmsServer" 
-           depends="get.platform.edition, set.jmsPEBroker, set.jmsSEBroker" >
-       <echo message="Using MQ broker=${jmsServer}"/>
-    </target>
-    <target name="set.jmsPEBroker" if="foundPE">
-          <property name="jmsServer" value="${s1as.pe.jmsServer}" />
-    </target>
-    <target name="set.jmsSEBroker" unless="foundPE">
-          <property name="jmsServer" 
-                          value="${s1as.se.jmsServer}" />
-    </target>
-
-
-    <!-- 
-       Delete the certs from the SJSAS keystore
-    -->
-    <target name="drop.certs" depends="configPlatform">
-       
-       <antcall target="delete.cert" >
-          <param name="cert.alias" value="${client.cert.alias}" />
-          <param name="trustStore" value="${s1as.domain.dir}/${s1as.domain.name}/config/cacerts.jks"/>
-          <param name="trustStore.password" value="${keystore.password}" />
-       </antcall>
-
-       <antcall target="delete.cert" >
-          <param name="cert.alias" value="RI_CERT" />
-          <param name="trustStore" 
-             value="${s1as.domain.dir}/${s1as.domain.name}/config/cacerts.jks"/>
-          <param name="trustStore.password" value="${keystore.password}" />
-       </antcall>
-     </target>
-
-    <!--
-       Add cts certificate to SJSAS
-     -->
-     <target name="add.cert" depends="configPlatform,checkForFiles,generate.certs" >
-        <antcall target="import.cert" >
-            <param name="cert.alias" value="${client.cert.alias}" />
-            <param name="cert.file" value="${cert.file}" />
-            <param name="trustStore.password" value="${keystore.password}" />
-            <param name="trustStore" 
-                   value="${s1as.domain.dir}/${s1as.domain.name}/config/cacerts.jks"/>
-        </antcall>
-
-         <antcall target="add.cts.cert.into.nss.databases"/>
-
-     </target>
-
-     <target name="add.cts.cert.into.nss.databases" if="found.nss.databases" >
-          <echo message="Importing cts certificate into NSS database" />
-          <exec executable="${exec.certutil}">
-            <env key="JAVA_HOME" value="${java.home}" />
-            <arg line=" ${exec.certutil.part2}" />
-            <arg line=" -A" />
-            <arg line=" -a" />
-            <arg line=" -n" />
-            <arg line=" cts" />
-            <arg line=" -t" />
-            <arg line=" CTP,CTP,CTP" />
-            <arg line=" -d" />
-            <arg line=" ${NSSConfigDir}" />
-            <arg line=" -i" />
-            <arg line=" ${bin.dir}/certificates/cts_cert" />
-          </exec>
-     </target>
-
-
-     <!--
-        Add the certificates needed for running the interop tests
-     -->
-     <target name="add.interop.certs" depends="configPlatform,checkForFiles,generate.certs" >
-
-        <!--
-             Next add the RI server certificate into the SJAS truststore
-        -->
-        <antcall target="export.cert" >
-            <param name="cert.alias" value="${server.cert.alias}" />
-            <param name="cert.file" value="${ts.home}/tmp/ri_server_cert.file" />
-            <param name="trustStore"
-                  value="${ri.domain.dir}/${ri.domain.name}/config/keystore.jks"/>
-            <param name="trustStore.password" value="${keystore.password}" />
-        </antcall>
-
-        <antcall target="import.cert" >
-            <param name="cert.alias" value="RI_CERT" />
-            <param name="cert.file" value="${ts.home}/tmp/ri_server_cert.file" />
-            <param name="trustStore.password" value="${keystore.password}" />
-            <param name="trustStore"
-                   value="${s1as.domain.dir}/${s1as.domain.name}/config/cacerts.jks"/>
-         </antcall>
-
-         <!--
-             Next add the SJAS server certificate into the RI truststore
-         -->
-        <antcall target="export.cert" >
-            <param name="cert.alias" value="${server.cert.alias}" />
-            <param name="cert.file" value="${ts.home}/tmp/vi_server_cert.file" />
-            <param name="trustStore"
-                  value="${s1as.domain.dir}/${s1as.domain.name}/config/keystore.jks"/>
-            <param name="trustStore.password" value="${keystore.password}" />
-        </antcall>
-
-        <antcall target="import.cert" >
-            <param name="cert.alias" value="VI_CERT" />
-            <param name="cert.file" value="${ts.home}/tmp/vi_server_cert.file" />
-            <param name="trustStore.password" value="${keystore.password}" />
-            <param name="trustStore"
-                   value="${ri.domain.dir}/${ri.domain.name}/config/cacerts.jks"/>
-         </antcall>
-
-         <antcall target="import.into.nss.databases" />
-
-         <antcall target="add.ssl.client.config" />
-
-         <!--
-            Note this target will restart only VI,
-            you should manually restart RI
-         -->
-        <antcall target="restart.server"/>
-        <echo message="Note: *** Please restart RI server manually ***" />
-        <echo message="Note: If you run CTS, VI and RI on the same machine you can restart RI using the following command  ant restart.ri " />
-
-     </target>
-
-     <target name="checkdasremote" >
-        <condition property="testingAgainstDAS">
-          <equals arg1="${sjsas.env.type}" arg2="das" casesensitive="true" trim="true"/>
-        </condition>
-
-        <condition property="testingAgainstRemoteInstance">
-          <equals arg1="${sjsas.env.type}" arg2="remote" casesensitive="true" trim="true"/>
-        </condition>
-     </target>
-
-     <target name="undeploy.all" depends="checkdasremote">
-         <antcall target="undeploy.all.das"/>
-         <antcall target="undeploy.all.remote"/>
-     </target>
-
-     <target name="undeploy.all.das" if="testingAgainstDAS">
-         <undeployall j2eehome="${javaee.home}" tshome="${ts.home}"/>
-     </target>
-
-     <target name="undeploy.all.remote" if="testingAgainstRemoteInstance">
-         <undeployall j2eehome="${javaee.home}"
-                      remoteinstance="true"
-                      tshome="${ts.home}"/>
-     </target>
-
-     <target name="config.jpa" >
-         <antcall target="create.jpa.vm.options"/>
-     </target>
-
-
-     <target name="unconfig.jpa" >
-         <antcall target="delete.jpa.vm.options"/>
-     </target>
-
-
-    <target name="start.javadb.asadmin"  depends="configPlatform">
-        <exec executable="${exec.asadmin}" failifexecutionfails="false">
-            <arg line="${exec.asadmin.part2}" />
-            <arg line=" start-database"/>
-            <arg line=" --dbport ${use.derby.port}"/>
-        </exec>
-    </target>
-
-    <target name="stop.javadb.asadmin"  depends="configPlatform">
-        <exec executable="${exec.asadmin}" failifexecutionfails="false">
-            <arg line="${exec.asadmin.part2}" />
-            <arg line=" stop-database"/>
-            <arg line=" --dbport ${use.derby.port}"/>
-        </exec>
-    </target>
-
-     <!-- Enable HTTP TRACE requests, they are disabled by default -->
-     <target name="enable.trace" depends="configPlatform">
-        <antcall target="set">
-          <param name="set.value" value=" ${server.instance}-config.network-config.protocols.protocol.http-listener-1.http.trace-enabled=true"/>
-        </antcall>
-     </target>
-
-</project>
diff --git a/bin/xml/impl/glassfish/templates/password.template b/bin/xml/impl/glassfish/templates/password.template
deleted file mode 100644
index dcec702640..0000000000
--- a/bin/xml/impl/glassfish/templates/password.template
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# 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
-#
-AS_ADMIN_MASTERPASSWORD=@sjsas.master.password@
-AS_ADMIN_PASSWORD=@sjsas.admin.password@
-AS_ADMIN_USERPASSWORD=@user.password@
diff --git a/bin/xml/impl/glassfish/templates/statefile.template.ee b/bin/xml/impl/glassfish/templates/statefile.template.ee
deleted file mode 100644
index a20ac8cfa8..0000000000
--- a/bin/xml/impl/glassfish/templates/statefile.template.ee
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# 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
-#
-
-#
-# Wizard Statefile created: Tue Apr 29 22:32:24 PDT 2003
-#              Wizard path: /home/qouyang/ws/test_checkin/publish/Linux2.4_DBG.OBJ/package/sun-appserver8-eval/j2ee_sdk_lin//home/qouyang/ws/test_checkin/publish/Linux2.4_DBG.OBJ/package/sun-appserver8-eval/j2ee_sdk_lin/appserv.class
-#
-
-#
-# Wizard Statefile section for J2EE 1.4 SDK
-#
-[STATE_BEGIN @begin.done.tag@ @class.id@]
-defaultInstallDirectory = /sun/appserver8
-currentInstallDirectory = @s1as.home@
-INST_ASADMIN_USERNAME = @s1as.admin.user@
-ADMIN_PASSWORD_ENCRYPTED = FALSE
-INST_ASADMIN_PASSWORD = @s1as.admin.passwd@
-INST_ASADMIN_PORT = @s1as.admin.port@
-INST_ASWEB_PORT = @sjsas.das.webServerPort@
-CREATE_SAMPLES_DOMAIN = FALSE
-STORE_ADMIN_AUTH = FALSE
-INST_HTTPS_PORT = @sjsas.das.securedWebServicePort@
-CREATE_DESKTOP_SHORTCUT = FALSE
-USE_BUNDLED_JDK= FALSE
-JDK_LOCATION = @java.home@
-[STATE_DONE @begin.done.tag@  @class.id@]
diff --git a/bin/xml/impl/none/deploy.xml b/bin/xml/impl/none/deploy.xml
deleted file mode 100644
index 94979ffc10..0000000000
--- a/bin/xml/impl/none/deploy.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<!--
-
-    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
-
--->
-
-<project name="No-op Deployment" default="deploy">
-
-    <!-- No-op deployment target -->
-    <target name="-deploy">
-        <echo message="No deploy target implemented for this deliverable"/>
-    </target>
-
-    <target name="-undeploy">
-        <echo message="No undeploy target implemented for this deliverable"/>
-    </target>
-
-    <target name="-deploy.all">
-        <echo message="No deploy target implemented for this deliverable"/>
-    </target>
-
-    <target name="-undeploy.all">
-        <echo message="No undeploy target implemented for this deliverable"/>
-    </target>
-
-</project>
diff --git a/bin/xml/impl/tomcat/deploy.xml b/bin/xml/impl/tomcat/deploy.xml
deleted file mode 100644
index 9bc30dfee8..0000000000
--- a/bin/xml/impl/tomcat/deploy.xml
+++ /dev/null
@@ -1,309 +0,0 @@
-<!--
-
-    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
-
--->
-
-<project name="Tomcat Deployment" default="-deploy">
-
-    <!-- IMPORTS -->
-    <import file="../../ts.common.props.xml" optional="true"/>
-
-    <!--<property name="deploy.dir" value="${deploy.dir}/"/>-->
-
-    <!-- PRESETDEFS -->
-    <presetdef name="tc.echo">
-        <echo message="Tomcat:  ${message}"/>
-    </presetdef>
-
-    <presetdef name="tc.fail">
-        <fail message="Tomcat:  ${message}"/>
-    </presetdef>
-
-    <!-- Deployment: DO NOT EDIT -->
-    <target name="-deploy">
-
-        <if>
-            <isset property="archive.file"/>
-            <then>
-                <fileset file="${archive.file}" id="deploy.archive.set"/>
-                <tc.echo message="Deploying:  ${archive.file}"/>
-            </then>
-        </if>
-
-        <ts.tomcat.undeploy>
-            <fileset refid="deploy.archive.set"/>
-        </ts.tomcat.undeploy>
-
-        <ts.tomcat.deploy>
-            <fileset refid="deploy.archive.set"/>
-        </ts.tomcat.deploy>
-    </target>
-
-    <target name="-deploy.all">
-        <ts.tomcat.undeploy>
-            <fileset refid="deploy.all.archive.set"/>
-        </ts.tomcat.undeploy>
-
-        <ts.tomcat.deploy>
-            <fileset refid="deploy.all.archive.set"/>
-        </ts.tomcat.deploy>
-    </target>
-
-    <target name="-undeploy.all">
-        <fileset dir="${deploy.dir}" id="undeploy.all.archive.set">
-                <include name="**/*.war"/>
-        </fileset>
-        <ts.tomcat.undeploy>
-            <fileset refid="undeploy.all.archive.set"/>
-        </ts.tomcat.undeploy>
-    </target>
-
-    <target name="-undeploy">
-        <if>
-            <isset property="archive.file"/>
-            <then>
-                <fileset file="${archive.file}" id="deploy.archive.set"/>
-                <tc.echo message="Undeploying:  ${archive.file}"/>
-            </then>
-        </if>
-
-        <ts.tomcat.undeploy>
-            <fileset refid="deploy.archive.set"/>
-        </ts.tomcat.undeploy>
-    </target>
-
-    <target name="-isdeployed">
-
-    </target>
-
-    <macrodef name="ts.tomcat.deploy">
-
-        <!--
-
-        -->
-        <element name="archiveset" implicit="yes" optional="true"
-                 description="Fileset for dirs to search for archives"/>
-
-        <sequential>
-
-        <var name="archive.count" unset="true"/>
-        <var name="tomcat.deploy.wait.time" unset="true"/>
-
-        <resourcecount property="archive.count">
-            <archiveset/>
-        </resourcecount>
-        <ts.verbose message="archive count - ${archive.count}"/>
-
-        <tc.echo message="${archive.count} archive(s) to deploy"/>
-        <if>
-            <not>
-                <equals arg1="${archive.count}" arg2="0"/>
-            </not>
-        <then>
-            <copy todir="${deploy.dir}" flatten="true">
-                <archiveset/>
-                <chainedmapper>
-                <filtermapper>
-                    <replacestring from="vi_built_" to=""/>
-                </filtermapper>
-                <flattenmapper/>
-                </chainedmapper>
-            </copy>
-
-            <!-- Set a default in case the deliverable foes not set it in the jte file -->
-            <property name="impl.deploy.timeout.multiplier" value="10"/>
-
-            <math result="tomcat.deploy.wait.time"
-                  operand1="${archive.count}"
-                  operation="*"
-                  operand2="${impl.deploy.timeout.multiplier}"
-                  datatype="int"/>
-
-            <for param="archive">
-                <archiveset/>
-
-            <sequential>
-                <propertyregex property="archive.name.only"
-                  input="@{archive}"
-                  regexp=".*[\/|\\](.*)"
-                  select="\1"
-                  casesensitive="false"
-                  override="true"/>
-
-                <propertyregex property="archive.name.minus.suffix"
-                  input="${archive.name.only}"
-                  regexp="\.war" replace=""
-                  casesensitive="false"
-                  override="true"/>
-
-                <propertyregex property="archive.name.minus.suffix.and.vibuilt"
-                  input="${archive.name.minus.suffix}"
-                  regexp="vi_built_" replace=""
-                  casesensitive="false"
-                  override="true"
-                  defaultvalue="${archive.name.minus.suffix}"/>
-
-                <waitfor maxwait="${tomcat.deploy.wait.time}" maxwaitunit="second"
-                         timeoutproperty="deploy.timeout">
-                   <available file="${deploy.dir}/${archive.name.minus.suffix.and.vibuilt}"
-                                   type="dir"/>
-                </waitfor>
-
-                <if>
-                    <available file="${deploy.dir}/${archive.name.minus.suffix.and.vibuilt}"
-                               type="dir"/>
-                    <then>
-                        <tc.echo message="Deployment Succeeded:  ${archive.name.only}"/>
-                    </then>
-                <else>
-                    <!-- Assume timeourt occurred and warn user to either increase timeout -->
-                    <tc.echo message="Deployment timeout reached - ${tomcat.deploy.wait.time} seconds."/>
-                    <tc.fail message="Deployment Failed for one ore more archives.  Check the log to see which failed."/>
-                </else>
-                </if>
-            </sequential>
-            </for>
-        </then>
-        </if>
-        </sequential>
-    </macrodef>
-
-    <macrodef name="ts.tomcat.undeploy">
-
-        <!--
-
-        -->
-        <element name="archiveset" implicit="yes" optional="true"
-                 description="Fileset for dirs to search for archives"/>
-
-        <sequential>
-
-        <pathconvert property="files.to.remove"
-                     pathsep=",">
-            <archiveset/>
-            <flattenmapper/>
-        </pathconvert>
-
-        <if>
-            <contains string="${files.to.remove}" substring="vi_built_"/>
-            <then>
-                <pathconvert property="files.to.remove2"
-                     pathsep=",">
-                    <archiveset/>
-                    <chainedmapper>
-                        <flattenmapper/>
-                        <globmapper from="vi_built_*" to="*"/>
-                    </chainedmapper>
-                </pathconvert>
-                <var name="files.to.remove" value="${files.to.remove2}"/>
-            </then>
-        </if>
-
-        <ts.verbose message="files.to.remove = ${files.to.remove}"/>
-
-        <if>
-            <not>
-                <equals arg1="${files.to.remove}" arg2=""/>
-            </not>
-        <then>
-
-            <fileset dir="${deploy.dir}"
-                     includes="${files.to.remove}"
-                     id="deploy.dir.archiveset">
-            </fileset>
-
-            <var name="files.to.remove" unset="true"/>
-            <pathconvert property="files.to.remove"
-                         pathsep=",">
-                <fileset refid="deploy.dir.archiveset"/>
-                <flattenmapper/>
-            </pathconvert>
-            <ts.verbose message="files.to.remove = ${files.to.remove}"/>
-
-            <var name="archive.count" unset="true"/>
-            <var name="tomcat.deploy.wait.time" unset="true"/>
-
-            <!-- Set a default in case the deliverable foes not set it in the jte file -->
-            <property name="impl.deploy.timeout.multiplier" value="10"/>
-
-
-            <resourcecount property="archive.count">
-                <fileset refid="deploy.dir.archiveset"/>
-            </resourcecount>
-            <ts.verbose message="archive count - ${archive.count}"/>
-
-            <tc.echo message="${archive.count} archive(s) to undeploy"/>
-            <if>
-                <not>
-                    <equals arg1="${archive.count}" arg2="0"/>
-                </not>
-            <then>
-                <var name="undeploy.failed" value="false"/>
-
-                <delete includeEmptyDirs="true"
-                    quiet="true">
-                   <fileset refid="deploy.dir.archiveset"/>
-                </delete>
-
-                <math result="tomcat.deploy.wait.time"
-                      operand1="${archive.count}"
-                      operation="*"
-                      operand2="${impl.deploy.timeout.multiplier}"
-                      datatype="int"/>
-
-                <for param="archive" list="${files.to.remove}">
-                <sequential>
-                    <ts.verbose message="archive = @archive"/>
-
-                    <propertyregex property="archive.name.minus.suffix"
-                                  input="@{archive}"
-                                  regexp="\.war" replace=""
-                                  casesensitive="false"
-                                  override="true"/>
-
-
-                    <waitfor maxwait="${tomcat.deploy.wait.time}" maxwaitunit="second"
-                             timeoutproperty="deploy.timeout">
-                        <not>
-                            <available file="${deploy.dir}/${archive.name.minus.suffix}"
-                                       type="dir"/>
-                        </not>
-                    </waitfor>
-
-                    <if>
-                        <not>
-                            <available file="${deploy.dir}/${archive.name.minus.suffix}"
-                                       type="dir"/>
-                        </not>
-                    <then>
-                        <tc.echo message="Undeployment Succeeded:  @{archive}"/>
-                    </then>
-                    <else>
-                        <!-- Assume timeout occurred and warn user to either increase timeout -->
-                        <ts.verbose message="Undeployment timeout reached - ${tomcat.deploy.wait.time} seconds."/>
-                        <tc.fail message="Undeployment Failed for some archives.  Check the log to see which failed."/>
-                    </else>
-                    </if>
-                </sequential>
-                </for>
-            </then>
-            </if>
-        </then>
-        </if>
-        </sequential>
-    </macrodef>
-
-</project>
diff --git a/bin/xml/other/unix.sh b/bin/xml/other/unix.sh
deleted file mode 100755
index c4cc687824..0000000000
--- a/bin/xml/other/unix.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2008, 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
-#
-
-for arg in "$@" ; do
-   case $arg in
-      startxterm)
-          newdir="$2"
-          if [ ! -d $newdir ]
-          then
-              exit -1
-          fi
-          cd $2
-          if [ $? -ne 0 ]
-          then
-              exit -1
-          fi
-          if [ "$TERM" = "" ]
-          then
-               TERM=xterm
-          fi
-          echo $newdir
-          $TERM &
-          exit 0
-          break
-          ;;
-   esac
-done
-exit 0
diff --git a/bin/xml/other/windows.bat b/bin/xml/other/windows.bat
deleted file mode 100755
index 966fe01746..0000000000
--- a/bin/xml/other/windows.bat
+++ /dev/null
@@ -1,31 +0,0 @@
-@echo off
-REM
-REM  Copyright (c) 2008, 2018 Oracle and/or its affiliates. All rights reserved.
-REM 
-REM  This program and the accompanying materials are made available under the
-REM  terms of the Eclipse Public License v. 2.0, which is available at
-REM  http://www.eclipse.org/legal/epl-2.0.
-REM 
-REM  This Source Code may also be made available under the following Secondary
-REM  Licenses when the conditions for such availability set forth in the
-REM  Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-REM  version 2 with the GNU Classpath Exception, which is available at
-REM  https://www.gnu.org/software/classpath/license.html.
-REM 
-REM  SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-REM
-
-@setlocal
-
-if ""%1""=="""" goto end
-if ""%1""==""startcmd"" goto startcmd
-
-goto end
-
-:startcmd
-set newdir="%2"
-start /d%newdir%
-goto end
-
-:end
-@endlocal
diff --git a/bin/xml/ts.clientjar.xml b/bin/xml/ts.clientjar.xml
deleted file mode 100644
index 3b317ccf03..0000000000
--- a/bin/xml/ts.clientjar.xml
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
-    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
-
--->
-
-<project name="ClientjarImport" basedir=".">
-
-    <!-- IMPORTS -->
-    <import file="./ts.common.xml"/>
-
-    <!-- LOCAL PROPERTY DEFINITIONS -->
-    
-    <!-- MACROS -->
-    <macrodef name="ts.clientjar">
-
-    <!--
-        The ts.clientjar task allows users to build application client archives.
-        By default all classes under TS_HOME/classes/<pkg.dir> are included in the
-        generated archive.  Users may specify additional content using nested fileset
-        and zipfileset elements.  User may also tweak the contents of the generated
-        archive by specifying various attribute values, see the attribute and element
-        tables for details.
-
-        Examples:
-
-        <ts.clientjar descriptor="ejb_sam_Hello_client.xml" 
-                      archivename="ejb_sam_Hello"
-                      mainclass="com.sun.ts.tests.samples.ejb.ee.simpleHello.HelloClient"/>
-
-        This example builds a client archive named ejb_sam_Hello_client.jar.  The deployment
-        descriptor in the application client archive, application-client.xml, is specified
-        using the descriptor attribute.  Note, the ejb_sam_Hello_client.xml file ends up in
-        the application client archive as the META-INF/application-client.xml with no diffs.
-        The mainclass attribute specifies the main-class entry added to the application
-        client's MANIFEST file.  The classes added to the archive are the default classes,
-        TS_HOME/classes/<pkg.dir>/**/*.class.  Where <pkg.dir> is the package name of the
-        test being built.
- 
-
-        <ts.clientjar descriptor="ejb_sam_Hello_client.xml" 
-                      archivename="ejb_sam_Hello"
-                      mainclass="com.sun.ts.tests.samples.ejb.ee.simpleHello.HelloClient">
-          <fileset dir="TS_HOME/classes" includes="<some-package>/*.class"/>
-          <fileset dir="TS_HOME/classes" includes="<some-other-package>/*.class"/>
-        </ts.clientjar>
-
-        This example is the same as the previous example except the user has opted to add
-        additional classes in addition to the default classes.  The additional classes are
-        specified using nested fileset elements.  Note, users may specify additional classes
-        using nested fileset or zipfileset elements.
-
-
-        <ts.clientjar descriptor="ejb_sam_Hello_client.xml" 
-                      archivename="ejb_sam_Hello"
-                      mainclass="com.sun.ts.tests.samples.ejb.ee.simpleHello.HelloClient"
-                      includedefaultfiles="false">
-          <fileset dir="TS_HOME/classes" includes="<some-package>/*.class"/>
-          <fileset dir="TS_HOME/classes" includes="<some-other-package>/*.class"/>
-        </ts.clientjar>
-
-        This example is the same as the previous example except the user has opted
-        to add additional classes instead of the default classes.  The additional classes
-        are specified using nested fileset elements.  Note, users may specify additional
-        classes using nested fileset or zipfileset elements.
-
-
-        <ts.clientjar descriptor="ejb_sam_Hello_client.xml" 
-                      archivename="ejb_sam_Hello"
-                      mainclass="com.sun.ts.tests.samples.ejb.ee.simpleHello.HelloClient"
-                      excludedfiles="${pkg.dir}/B*.class>
-        </ts.clientjar>
-
-        This example excludes all class files that start with "B" that live in the
-        TS_HOME/classes/${pkg.dir}.  If the TS_HOME/classes/${pkg.dir} contained the classes A.class,
-        B1.class, B2.class and C.class only classes A and C would end up in the archive.  Using the
-        excludedfiles attribute is another way of customizing the content of the archive by excluding
-        some of the default content.  Users can also use the includedefaultfiles attribute to exclude
-        all default content but the user must then use nested filesets and or zipfilesets to include
-        the appropriate content.  Using the excludedfiles attribute may be simpler in some cases.
-
-        To continue this example, the following XML does the exact same thing as the example above
-        but it uses the includedefaultfiles attribute and a nested fileset element.
-
-        <ts.clientjar descriptor="ejb_sam_Hello_client.xml" 
-                      archivename="ejb_sam_Hello"
-                      mainclass="com.sun.ts.tests.samples.ejb.ee.simpleHello.HelloClient"
-                      includedefaultfiles="false">
-          <fileset dir="TS_HOME/classes" includes="${pkg.dir}/A.class, ${pkg.dir}/C.class"/>
-        </ts.clientjar>
-
-      -->
-
-        <attribute name="descriptor"
-                   default=""        
-                   description="Deployment descriptor added to the archive if the archive requires a deployment descriptor"/>
-                              
-        <attribute name="manifest"
-                   default=""
-                   description="Manifest to be used within the archive"/>
-        
-        <attribute name="archivename"   
-                   description="Archive name minus the file suffix"/>
-                   
-        <attribute name="descriptordir"
-                   default="${src.dir}/${pkg.dir}"
-                   description="Directory containing the deployment descriptor"/>           
-        
-        <attribute name="mainclass"
-                   default=""    
-                   description="main-class MANIFEST entry for the appclient archive"/>
-
-        <attribute name="includedefaultfiles"
-                   default="true"
-                   description="Include default files in the component archive"/>
-                  
-        <attribute name="excludedfiles"
-                   default=""
-                   description="A comma separated list of file expressions to exclude from the set of default included files.  This list of file expressions is relative to the TS_HOME/classes directory."/>
-
-        <element name="jar-elements" implicit="yes" optional="true" 
-                 description="The content to be added to the archive"/>
-        
-        <sequential>
-        
-        <!-- Define commmon preset regardless of includedefaultfiles value-->
-        <presetdef name="component.clientjar">
-            <_component descriptor="@{descriptor}"
-                       manifest="@{manifest}"
-                       archivename="@{archivename}"
-                       archivesuffix="_client.jar"
-                       descriptordir="@{descriptordir}"
-                       mainclass="@{mainclass}"
-                       internaldescriptorname="META-INF/application-client.xml">
-                <fileset dir="${class.dir}"
-                         includes="${test.base.classes}"/>
-            </_component>
-        </presetdef>
-        
-        <if>
-          <istrue value="@{includedefaultfiles}"/>
-        <then>
-          <component.clientjar>
-              <fileset dir="${class.dir}"
-                       includes="${pkg.dir}/**/*.class"
-                       excludes="@{excludedfiles}"/>
-              <jar-elements/>
-          </component.clientjar>
-        </then>
-        <else>
-          <component.clientjar>
-            <jar-elements/>            
-          </component.clientjar>
-        </else>
-        </if>
-        </sequential>
-    </macrodef>
-    
-    <!-- PRESETS -->
-    
-    <!-- TARGETS -->
-   
-</project>
diff --git a/bin/xml/ts.common.props.xml b/bin/xml/ts.common.props.xml
deleted file mode 100644
index 8f07bb261d..0000000000
--- a/bin/xml/ts.common.props.xml
+++ /dev/null
@@ -1,488 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
-    Copyright (c) 2018, 2021 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
-
--->
-
-<project name="CommonProps" basedir=".">
-
-    <!-- 
-    This is a common import file that contains properties that are shared
-    by all build files.  
-    -->
-    
-    <property environment="env"/>
-    
-    <dirname property="CommonProps.basedir" file="${ant.file.CommonProps}"/>
-    
-    <!--<condition property="dir.path.sep" value="\\"
-                                       else="/">
-        <os family="windows"/>
-    </condition>
--->
-    <property name="dir.sep"       value="${file.separator}"/>
-    <property name="dirsep"        value="${file.separator}"/>
-
-    <property name="pathsep"        value="${path.separator}"/>
-
-    <!--<condition property="pathsep" value=";"
-                                  else=":">
-        <os family="windows"/>
-    </condition>
--->
-
-    <!-- Set ts.home based upon whether this file is in the install dir 
-         or not
-    -->
-    <condition property="ts.home" 
-               value="${CommonProps.basedir}${file.separator}..${file.separator}..${file.separator}..${file.separator}.."
-               else="${CommonProps.basedir}${file.separator}..${file.separator}..">
-        <contains string="${CommonProps.basedir}" 
-                 substring="install${file.separator}common${file.separator}bin${file.separator}xml"/>
-    </condition>
-    <echo message="ts.home = ${ts.home}"/>
-    
-    <!-- Need to set jdk.home in case java.home points to a JRE -->
-    <condition property="jdk.home" 
-               value="${java.home}"
-               else="${java.home}${file.separator}..">
-        <available file="${java.home}${file.separator}lib${file.separator}tools.jar"/>
-    </condition>
-
-    <property name="RI_JAVA_HOME"  value="${env.RI_JAVA_HOME}"/>
-    
-    <!-- Common properties -->
-    <property name="dist.dir"        value="${ts.home}/dist"/>
-    <property name="src.dir"         value="${ts.home}/src"/>
-    <property name="lib.dir"         value="${ts.home}/lib"/>
-    <property name="tmp.dir"         value="${ts.home}/tmp"/>
-    <property name="weblib.dir"      value="${ts.home}/weblib"/>
-    <property name="install.dir"     value="${ts.home}/install"/>
-    <property name="common.bin.dir"  value="${ts.home}/bin"/>
-    
-    <taskdef resource="net/sf/antcontrib/antlib.xml"
-             classpath="${lib.dir}/ant-contrib-1.0b3.jar"/>
-    
-    <property name="ant.jars" value="${ant.home}/lib/ant.jar:
-                                     ${ant.home}/lib/ant-launcher.jar:
-                                     ${ant.home}/lib/ant-nodeps.jar"/>
-
-    <!--
-         checkPlatform determines which OS is being utilized.
-    -->
-    <target name="checkPlatform" >
-        <condition property ="isUnixPlatform">
-           <os family="unix"/>
-        </condition>
-        <condition property ="isWindowsPlatform">
-           <os family="windows"/>
-        </condition>
-        <condition property ="os" value="unix">
-           <os family="unix"/>
-        </condition>
-        <condition property ="os" value="windows">
-           <os family="windows"/>
-        </condition>
-        <condition property ="isMac">
-           <os family="mac"/>
-        </condition>
-        
-        <!-- Is the the Java EE RI? -->
-        <condition property="is.ri">
-           <and>
-              <available file="${server.home}/README.install"/>
-              <available file="${server.home}/setup.xml"/>
-           </and>
-        </condition>
-        <propertyregex property="bit.mode"
-                  input="${os.arch}"
-                  regexp="(^.*)(64)$"
-                  select="\2"
-                  casesensitive="false"
-                  />
-        <if>
-            <and>
-                <isset property="bit.mode"/>
-                <equals arg1="${bit.mode}" arg2="64"/>
-            </and>
-        <then>
-            <var name="jvm.64bit" value="true"/>
-        </then>
-        <else>
-            <var name="jvm.64bit" value="false"/>
-        </else>
-        </if>
-    </target>
-                                     
-    <target name="get.deliverable.version.number"/>
-    
-    <!-- Set class.dir based on the setting of build.vi-->
-    <if>
-        <equals arg1="${build.vi}" arg2="true"/>
-    <then>
-        <property name="class.dir" value="${ts.home}/classes_vi_built"/>
-    </then>
-    <else>
-        <property name="build.vi" value="false"/>
-        <property name="class.dir" value="${ts.home}/classes"/>
-    </else>
-    </if>
-  
-    <mkdir dir="${class.dir}"/>
-    <mkdir dir="${dist.dir}"/>
-    <mkdir dir="${tmp.dir}"/>
-    <mkdir dir="${weblib.dir}"/>
-    
-    <!-- Set the deliverable bin dir based on whether ant setup was run
-         (as in a bundle) or we're in the install deliverable dir -->
-    <if>
-        <available file="${CommonProps.basedir}/../ts.jte"/>
-    <then>
-        <property name="in.workspace" value="false"/>
-        <property file="${CommonProps.basedir}/../ts.jte"/>
-        <property name="bin.dir" value="${ts.home}${file.separator}bin"/>
-        
-        <!-- Set the deliverable.dir and deliverabledir properties to none since
-        we're in a bundle.  This is to prevent the recursive definition error
-        when passing in deliverable.dir as a system property to JavaTest.  When
-        the AbstractPropertyManager looks up the system props, since we're in a
-        bundle, the prop is set to "${deliverable.dir} and results in a
-        recursive definition error when Javatest calls back into ant during
-        AutoDeployment.  Thus we'll just set it here so the error doesn't occur.
-        The prop is not used when in a bundle, so the value doesn't matter-->
-        <property name="deliverable.dir" value="none"/>
-        <property name="deliverabledir" value="none"/>
-        <echo message="In a bundle"/>
-        <echo message="The deliverable currently in use is ${bin.dir}."/>
-    </then>
-    <else>
-        <property name="in.workspace" value="true"/>
-        <if>
-            <isset property="env.deliverabledir"/>
-        <then>
-            <property name="deliverable.dir" value="${env.deliverabledir}"/>
-            <property name="deliverabledir" value="${env.deliverabledir}"/>
-        </then>
-        <elseif>
-            <isset property="deliverabledir"/>
-          <then>
-              <property name="deliverable.dir" value="${deliverabledir}"/>
-          </then>
-        </elseif>
-        <else>
-            <!-- Let's try and figure out the deliverable.dir based on what 
-            src dir we're in
-            -->
-            <if>
-                <contains string="${basedir}" 
-                          substring="signaturetest"/>
-                <then>
-                    <echo message="basedir = ${basedir}"/>
-                    
-                    <propertyregex property="deliverable.dir"
-                                   input="${basedir}${file.separator}"
-                                   regexp=".*[\/|\\]sun[\/|\\]ts[\/|\\]tests[\/|\\]signaturetest[\/|\\](.*?)[\/|\\]"
-                                   select="\1"
-                                   casesensitive="false" />
-                </then>
-                <elseif>
-                    <contains string="${basedir}" 
-                              substring="${file.separator}install${file.separator}"/>
-                    <then>
-                        <propertyregex property="deliverable.dir"
-                                       input="${basedir}${file.separator}"
-                                       regexp=".*[\/|\\]install[\/|\\](.*?)[\/|\\]"
-                                       select="\1"
-                                       casesensitive="false" />
-                    </then>    
-                </elseif>
-                <elseif>
-                    <contains string="${basedir}" 
-                              substring="com${file.separator}sun${file.separator}ts${file.separator}lib"/>
-                    <then>
-                        <property name="deliverable.dir" value="j2ee"/>
-                    </then>    
-                </elseif>
-                <else>
-                    <propertyregex property="deliverable.dir"
-                                   input="${basedir}${file.separator}"
-                                   regexp=".*[\/|\\]sun[\/|\\]ts[\/|\\]tests[\/|\\](.*?)[\/|\\]"
-                                   select="\1"
-                                   casesensitive="false" />
-                </else>
-            </if>  
-        </else>
-        </if>
-          
-        <if>
-            <equals arg1="${deliverable.dir}" arg2="javaee"/>
-        <then>
-            <var name="deliverable.dir" value="j2ee"/>
-        </then>
-        </if>
-        
-        <if>
-          <not>
-            <available file="${ts.home}${file.separator}install${file.separator}${deliverable.dir}" type="dir"/>
-          </not>
-          <then>
-            <fail message="There is no deliverabledir by the name of ${deliverable.dir} under ${ts.home}${file.separator}install.  Please set deliverabledir in your environment"/>
-          </then>
-        </if>
-        
-        <if>
-            <available file="${ts.home}${file.separator}install${file.separator}${deliverable.dir}${file.separator}bin${file.separator}ts.jte"/>
-        <then>
-            <echo message="The deliverable currently in use is ${ts.home}${file.separator}install${file.separator}${deliverable.dir}."/>
-        </then>
-        <else>
-            <fail message="There is no ts.jte under ${ts.home}${file.separator}install${file.separator}bin. Please set your java test environment"/>
-        </else>
-        </if>
-        
-        <property name="bin.dir" value="${CommonProps.basedir}/../../install/${deliverable.dir}/bin"/>
-        <property file="${bin.dir}/ts.jte"/>
-        
-        <copy file="${bin.dir}/../other/testsuite.jtt" todir="${src.dir}"
-              overwrite="true" failonerror="false"/>
-        <delete file="${src.dir}/vehicle.properties" failonerror="false"/>
-        <copy file="${bin.dir}/../other/vehicle.properties" todir="${src.dir}"
-              overwrite="true" failonerror="false"/>
-    </else>
-    </if>
-    
-    <!-- Set this until we get rid of it for the bundle xml files to use-->
-    <property name="deliverable.name" value="${deliverable.dir}"/>
-    
-    <!-- Presetdef for tasks using ant_sun.jar -->
-    <presetdef name="ts.taskdef">
-        <taskdef classpath="${lib.dir}/ant_sun.jar"/>
-    </presetdef>
-
-    <presetdef name="ts.verbose">
-        <!--
-          The ts.verbose task is used to print messages only when running ant with the -v  or debug options.
-        -->
-        <echo level="verbose"/>
-    </presetdef>
-    
-    <presetdef name="ts.echo">
-        <echo/>
-    </presetdef>
-    
-    <!-- Override antcall so that deliverable.dir maintains its value across projects -->
-    <!--<presetdef name="antcall">
-        <antcall>
-            <param name="deliverable.dir" value="${deliverable.dir}"/>
-        </antcall>
-    </presetdef>
-    -->
-    <!-- FindBugs and PMD related files are removed -->
-    <!-- Findbugs home directory -->
-    <!-- property name="findbugs.dir"   value="${ts.home}/tools/findbugs"/ -->
-	
-    <!-- PMD home directory -->
-    <!-- property name="pmd.dir"   value="${ts.home}/tools/pmd"/ -->
-    
-    <!-- Common tasks used across the workspace and packaged in ant_sun.jar -->
-    <ts.taskdef name="translatepath" 
-                classname="com.sun.ant.taskdefs.common.PathTranslator"/>
-    <ts.taskdef name="elementappend" 
-                classname="com.sun.ant.taskdefs.common.ElementAppend"/>
-    <ts.taskdef name="dosubdirs" 
-                classname="com.sun.ant.taskdefs.common.DoSubdirs"/>
-    <ts.taskdef name="dotarget" 
-                classname="com.sun.ant.taskdefs.common.DoTarget"/>
-    <ts.taskdef name="appendafter" 
-                classname="com.sun.ant.taskdefs.common.AppendAfter"/>
-    <ts.taskdef name="insertbefore" 
-                classname="com.sun.ant.taskdefs.common.InsertBefore"/>
-    <ts.taskdef name="propertyindex" 
-                classname="com.sun.ant.taskdefs.common.PropertyIndex"/>
-    <ts.taskdef name="undeployall" 
-                classname="com.sun.ant.taskdefs.common.UndeployAll"/>
-    <ts.taskdef name="encode" classname="com.sun.ant.taskdefs.common.Encoder"/>
-    <ts.taskdef name="string" classname="com.sun.ant.taskdefs.common.MyString"/>
-    <ts.taskdef name="spawn" classname="com.sun.ant.taskdefs.s1as.SpawnTask"/>
-    <ts.taskdef name="runcts" classname="com.sun.ant.taskdefs.common.RunCTS"/>
-    <taskdef name="modifyxml" classname="com.sun.ant.taskdefs.xml.ModifyXML"
-             classpath="${lib.dir}/ant_sun.jar:${lib.dir}/jdom-1.1.3.jar:${lib.dir}/jaxen-core-1.0.jar:${lib.dir}/jaxen-1.1.6.jar:${lib.dir}/saxpath.jar"/>
-    <taskdef name="configctsjcov" 
-             classname="com.sun.ant.taskdefs.common.JCOVCTSConfig"
-             classpath="${lib.dir}/ant_sun.jar:${lib.dir}/jdom-1.1.3.jar"/>
-    <taskdef name="configctsemma" 
-             classname="com.sun.ant.taskdefs.common.EMMACTSConfig"
-             classpath="${lib.dir}/ant_sun.jar:${lib.dir}/jdom-1.1.3.jar"/>
-    <taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask"
-             classpath="${findbugs.dir}/lib/findbugs-ant.jar"
-             onerror="ignore"/>
-	<ts.taskdef name="props.sanitizer" 
-		classname="com.sun.ant.taskdefs.common.PropsSanitizer" />
-    <taskdef name="pmd" classname="net.sourceforge.pmd.ant.PMDTask"
-             classpath="${pmd.dir}/lib/pmd-4.3.jar"
-             onerror="ignore"/>
-    
-    <property file="${src.dir}/vehicle.properties"/>
-                             
-    <property name="ejbvehicle.classes"         value=""/>
-    <property name="servletvehicle.classes"     value=""/>
-    <property name="jspvehicle.classes"         value=""/>
-    <property name="appclientvehicle.classes"   value=""/>
-    
-    <!-- Package directories -->
-    <property name="lib.pkg.dir"     value="com/sun/ts/lib"/>
-    <property name="tests.pkg.dir"   value="com/sun/ts/tests"/>
-    <property name="sig.pkg.dir"     value="${tests.pkg.dir}/signaturetest"/>
-    <property name="harness.pkg.dir" value="${lib.pkg.dir}/harness"/>
-    <property name="impl.pkg.dir"    value="${lib.pkg.dir}/implementation"/>
-    <property name="util.pkg.dir"    value="${lib.pkg.dir}/util"/>
-    <property name="porting.pkg.dir" value="${lib.pkg.dir}/porting"/>
-    
-    <property name="vehicle.pkg.dir" value="${tests.pkg.dir}/common/vehicle"/>
-    <property name="webservices.pkg.dir" value="${tests.pkg.dir}/common/webservices"/>
-    <property name="vehicle.src.dir" value="${ts.home}/src/${vehicle.pkg.dir}"/>
-        
-    <!-- Rebuildable directory related properties -->
-    <property name="vi.build.string" value="vi_built"/>
-    <property file="${src.dir}/${harness.pkg.dir}/rebuildable.properties"/>
-    <property name="rebuildable" value="false"/>
-    <property name="rebuildable.prop.name" value=""/>
-    <property name="saved.pkg.dir" value=""/>
-
-    <!--
-    <property name="vi.xml.impl.dir" value="${common.bin.dir}/xml/implementation/${vi.implementation}"/>
-    <property name="ri.xml.impl.dir" value="${common.bin.dir}/xml/implementation/${ri.implementation}"/>
--->
-
-    <!-- Set JavvatestMaxOutputSize if it is not set yet in the ts.jte file -->
-    <property name="harness.maxoutputsize"   value="200000"/>
-
-    <!-- Extension list library version number -->
-    <property name="extension.lib.version"   value="1.4"/>
-
-    <propertyregex property="pkg.dir"
-                   input="${basedir}"
-                   regexp=".*src[\/|\\](.*)"
-                   select="\1"
-                   casesensitive="true"
-                   override="true"/>
-                   
-    <!-- dynamically compute the java package for the current test directory, e.g.,
-         com.sun.ts.tests.samples.ejb.ee.simpleHello  -->
-    <propertyregex property="package"
-                        input="${pkg.dir}"
-                        regexp="[\/|\\]" replace="\."
-                        casesensitive="true"
-                        override="true"/>
-
-    <!-- dynamically compute the default application client main class, e.g.,
-         com.sun.ts.tests.ejb30.bb.session.stateless.basic.Client -->
-    <property name="client" value="${package}.Client"/>
-
-    <property name="default.vehicles" value="ejb servlet jsp appclient"/>
-    <property name="test.base.classes"  
-              value="${harness.pkg.dir}/EETest*.class"/>
-
-    <pathconvert property="src.path">
-        <path>
-            <pathelement location="${src.dir}"/>
-        </path>
-    </pathconvert>
-    
-    <!-- Variables -->
-
-    <!--
-        Store the vehicles that are processed into a variable that is visible to the importing
-        build files.  This allows leaf build files the ability to run specific sets of tasks
-        based on the vehicles that were built.
-    -->    
-    <var name="vehicle.prop.name" value=""/>
-    <var name="vehicles" value="${default.vehicles}"/>               
-
-    <!--<if>
-        <os family="windows"/>
-    <then>
-        <property name="dir.path.sep" value="\"/>
-        <property name="pathsep" value=";"/>
-    </then>
-    <else>
-        <property name="dir.path.sep" value="/"/>
-        <property name="pathsep" value=":"/>
-    </else>    
-    </if>
-    -->
-    
-    <!-- Set ts.home based upon whether this file is in the install dir 
-         or not
-    -->
-    <!--
-    <if>
-        <contains string="${CommonProps.basedir}" 
-                 substring="install${file.separator}common${file.separator}bin${file.separator}xml"/>
-    <then>
-        <property name="ts.home" 
-        value="${CommonProps.basedir}${file.separator}..${file.separator}..${file.separator}..${file.separator}.."/>
-    </then>
-    <else>
-        <property name="ts.home" 
-        value="${CommonProps.basedir}${file.separator}..${file.separator}.."/>
-    </else>
-    </if>
-    -->
- 
- 
-	<property name="unknown.compiler.arg" value=""/>
-	<property name="jdk1.6.compiler.arg" value="-Djava.endorsed.dirs=${endorsed.dirs}"/>
-	<property name="jdk1.7.compiler.arg" value="${jdk1.6.compiler.arg}"/>
-	<property name="jdk1.8.compiler.arg" value="${jdk1.6.compiler.arg}"/>
-	<property name="jdk9.compiler.arg" value="--add-modules java.activation --add-modules java.transaction --add-modules java.xml.bind --add-modules java.xml.ws --add-modules java.xml.ws.annotation --patch-module java.transaction=${s1as.modules}/jakarta.transaction-api.jar --patch-module java.xml.ws.annotation=${s1as.modules}/endorsed/jakarta.annotation-api.jar --add-exports java.xml.ws.annotation/jakarta.annotation.security=ALL-UNNAMED --add-exports java.xml.ws.annotation/jakarta.annotation=ALL-UNNAMED --add-exports java.xml.ws.annotation/jakarta.annotation.sql=ALL-UNNAMED" />
-	<property name="jdk11.compiler.arg" value="--patch-module java.activation=${s1as.modules}/jakarta.activation.jar --patch-module java.xml.bind=${s1as.modules}/endorsed/jaxb-api.jar --patch-module java.transaction=${s1as.modules}/jakarta.transaction-api.jar --patch-module java.xml.ws.annotation=${s1as.modules}/endorsed/jakarta.annotation-api.jar" />
-
-	<if>
-	    <equals arg1="${ant.java.version}" arg2="1.6"/>
-	    <then>
-	    	<property name="jdk.compiler.args" value="${jdk1.6.compiler.arg}"/>
-	    </then>
-		<elseif>
-	    	<equals arg1="${ant.java.version}" arg2="1.7"/>
-	        <then>
-	        	<property name="jdk.compiler.args" value="${jdk1.7.compiler.arg}"/>
-	        </then>
-	    </elseif>
-		<elseif>
-	    	<equals arg1="${ant.java.version}" arg2="1.8"/>
-	        <then>
-	        	<property name="jdk.compiler.args" value="${jdk1.8.compiler.arg}"/>
-	        </then>
-	    </elseif>
-		<elseif>
-	    	<equals arg1="${ant.java.version}" arg2="1.9"/>
-	        <then>
-	        	<property name="jdk.compiler.args" value="${jdk9.compiler.arg}"/>
-	        </then>
-	    </elseif>
-	    <elseif>
-	    	<equals arg1="${ant.java.version}" arg2="11"/>
-	        <then>
-	        	<property name="jdk.compiler.args" value="${jdk11.compiler.arg}"/>
-	        </then>
-	    </elseif>
-	    <else>
-	    	<property name="jdk.compiler.args" value="${unknown.compiler.arg}"/>
-	    </else>
-	</if>
-
-</project>
diff --git a/bin/xml/ts.common.xml b/bin/xml/ts.common.xml
deleted file mode 100644
index 42d9a32450..0000000000
--- a/bin/xml/ts.common.xml
+++ /dev/null
@@ -1,1293 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
-    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
-
--->
-
-<project name="ComponentImport" basedir=".">
-
-	<!-- IMPORTS -->
-	<import file="./ts.common.props.xml"/>
-
-	<!-- 
-    This is a common import file that contains targets, macrodefs, 
-    and presetdefs that are necessary for top level
-    ${bin.dir}/build.xml files as well as src leaf build.xml files.  
-    -->
-
-	<!--  We need to remove these after cleaning the src level build files 
-    from calling to the top for clean and compile-->
-	<target name="compile" 
-            description="Compiles all java files under a src directory">
-		<ts.javac/>
-	</target>
-
-	<target name="deploy.run.undeploy">
-		<antcall target="deploy" />
-		<sleep seconds="10" />
-		<antcall target="runclient" />
-		<antcall target="undeploy" />
-	</target>
-
-	<target name="-preclean"
-            description="Initial dependency target for the clean target"/>
-
-	<target name="clean" depends="-preclean"
-            description="Cleans all classes and archives that were built from a src directory">
-		<ts.clean/>
-	</target>
-
-	<!-- Targets -->
-	<target name="clean.all.classes" 
-            description="Cleans all classes from the classes directory">
-		<delete failonerror="false" includeEmptyDirs="true">
-			<fileset dir="${class.dir}" includes="*/**"/>
-		</delete>
-	</target>
-
-	<target name="clean.all.dist"
-            description="Cleans everything from the dist directory">
-		<delete failonerror="false" includeEmptyDirs="true">
-			<fileset dir="${dist.dir}" includes="*/**"/>
-		</delete>
-	</target>
-
-	<target name="clean.all" 
-            description="Cleans everything from the dist + classes directory"
-            depends="clean.all.classes, clean.all.dist"/>
-
-	<target name="usage" 
-            description="Displays usage information">
-		<ts.usage/>
-	</target>
-
-	<target name="version"
-            description="Displays the version information for this TCK">
-
-		<if>
-			<available file="${common.bin.dir}/version"/>
-			<then>
-				<loadfile property="ts.version.file" srcFile="${common.bin.dir}/version"/>
-				<echo message="${ts.version.file}"/>
-				<property name="has.version" value="true"/>
-			</then>
-		</if>
-
-		<if>
-			<available file="${common.bin.dir}/version-cts-internal"/>
-			<then>
-				<loadfile property="ts.internal.version.file" srcFile="${common.bin.dir}/version-cts-internal"/>
-				<echo message="${ts.internal.version.file}"/>
-				<property name="has.version" value="true"/>
-			</then>
-		</if>
-
-		<if>
-			<not>
-				<isset property="has.version"/>
-			</not>
-			<then>
-				<echo message="No version information available."/>
-			</then>
-		</if>
-	</target>
-
-	<!--<target name="createbuildfile" 
-            description="Generates a template build.xml for a given src directory"
-            depends="-check.in.src">
-        <ts.buildfile create="true"/>
-    </target>
-    -->
-
-	<!-- Temporary target-should be removed once all targets use check.in.src-->
-	<target name="check.in.bin" depends="-check.in.src"/>
-
-	<target name="-check.in.src">
-		<if>
-			<not>
-				<contains string="${basedir}" substring="${src.path}"/>
-			</not>
-			<then>
-				<fail message="This target must be executed from under the src directory."/>
-			</then>
-		</if>
-	</target>
-
-	<presetdef name="ts.javac">
-
-		<!-- 
-          The ts.javac task is a presetdef that sets many of the common attributes and elements
-          used by all javac commands with the spider workspace.  To see the preset values, refer
-          to the included XML below that shows the content of the ts.javac presetdef.
-        -->
-		<javac fork="true" srcdir="${ts.home}/src" 
-               includeAntRuntime="false"
-               debug="on"
-               destdir="${class.dir}" 
-               includes="${pkg.dir}/**/*.java"
-               memoryMaximumSize="400m"
-               deprecation="on" >
-			<classpath>
-				<pathelement path="${ts.classpath}${pathsep}${ant.home}/lib/ant.jar" />
-			</classpath>
-			<compilerarg line="${jdk.compiler.args}"/>
-		</javac>
-	</presetdef>
-
-	<presetdef name="ts.pmd">
-		<pmd rulesetfiles="basic,imports,unusedcode,design">
-			<auxClasspath path="${pmd.home}/lib/pmd-4.3.jar" />
-			<formatter type="xml" toFile="${src.dir}/pmd_output.xml" />
-			<fileset dir="${src.dir}/${pkg.dir}">
-				<include name="**/*.java" />
-			</fileset>
-		</pmd>
-	</presetdef>
-
-	<presetdef name="ts.findbugs">
-		<findbugs home="${findbugs.dir}" output="text" quietErrors="true" jvmargs="-Xms64m -Xmx512m" timeout="3600000" excludeFilter="${ts.home}/internal/findbugs/exclude.xml">
-			<auxClasspath path="${ts.classpath}:${ts.home}/classes:${ant.home}/lib/ant-launcher.jar" />
-			<sourcePath path="${src.dir}/${pkg.dir}" />
-			<class location="${class.dir}/${pkg.dir}" />
-		</findbugs>
-	</presetdef>
-
-	<presetdef name="ts.findbugs.xml">
-		<ts.findbugs output="xml:withMessages" outputFile="findbugs.xml">
-		</ts.findbugs>
-	</presetdef>
-
-	<presetdef name="ts.findbugs.html">
-		<ts.findbugs output="html"
-                     outputFile="findbugs.html">
-		</ts.findbugs>
-	</presetdef>
-
-	<presetdef name="ts.lib.jar">
-
-		<!-- 
-          The ts.lib.jar task is a presetdef that calls the jar task
-          passing common manifest information for all deliverable library jars.
-          To see the preset values, refer to the included XML below that shows 
-          the content of the ts.lib.jar presetdef.
-        -->
-
-		<jar jarfile="${ts.home}/lib/${tslib.name}.jar"
-             basedir="${class.dir}">
-			<manifest>
-				<attribute name="Extension-Name"         value="${tslib.name}"/>
-				<attribute name="Specification-Title"    value="${tslib.name}"/>
-				<attribute name="Specification-Version"    value="${extension.lib.version}"/>
-				<attribute name="Implementation-Version"   value="${extension.lib.version}"/>
-				<attribute name="Implementation-Vendor-Id" value="com.sun"/>
-				<attribute name="Implementation-Vendor"    
-                           value="Sun Microsystems, Inc"/>
-				<attribute name="Specification-Vendor" 
-                           value="Sun Microsystems"/>
-			</manifest>
-		</jar>
-
-	</presetdef>
-
-	<presetdef name="ts.clean.classes">
-
-		<!-- 
-          The clean task is used when cleaning only classes directories.
-          The default behavior is to delete all files under 
-          ${class.dir}/${pkg.dir}.
-        -->
-		<delete failonerror="false" includeEmptyDirs="true"
-                dir="${class.dir}/${pkg.dir}"/>
-	</presetdef>
-
-	<macrodef name="ts.usage">
-
-		<!-- 
-        The ts.usage task displays standard usage information for build files
-        executed from under $TS_HOME/src.
-      -->
-
-		<sequential>
-			<echo message="If you run ant in a test directory, use the following targets:"/>
-			<echo message="gui build clean runclient usage ld lld lc llc pd pc pcvi"/>
-			<echo message="-"/>
-			<echo message="ld lld lc llc lists the content of corresponding dist dir and classes dir."/>
-			<echo message="pd pc pcvi - opens a new terminal window with dist dir or classes dir being the current dir"/>
-			<echo message="-"/>
-			<echo message="To run a single test in a leaf directory:"/>
-			<echo message="ant -Dtest=&lt;twobeanTest2&gt; [-Dtest.client=&lt;TwoBeanClient.java&gt;] runclient
-        ${line.separator} ${line.separator} ${line.separator}"/>
-
-			<echo message="*******************************************"/>
-			<echo message="*******************************************"/>
-			<echo message="List of targets, generated via ant -p:"/>
-			<java classname="org.apache.tools.ant.Main">
-				<arg value="-p"/>
-				<classpath path="${java.class.path}"/>
-			</java>
-		</sequential>
-	</macrodef>
-
-	<macrodef name="ts.buildfile">
-
-		<!-- 
-        If a build.xml file exists already, the ts.buildfile task displays a 
-        template for a leaf level build file.  If no build.xml file exists,
-      -->
-
-		<attribute name="create"
-                 default="false"
-                 description="Generate a template build.xml file."/>
-
-		<sequential>
-			<propertyregex property="relative.archive.name"
-                       input="${basedir}"
-                       regexp=".*[\/|\\]src[\/|\\](.*)"
-                       select="\1"
-                       casesensitive="false"
-                       override="true"/>
-
-			<var name="newval" value="../"/>
-
-			<var name="counter2" value="1"/>
-			<for list="${relative.archive.name}" delimiter="\" param="word">
-				<sequential>
-					<var name="newval" value="../${newval}"/>
-					<math result="counter2" operand1="${counter2}" 
-                  operation="+" operand2="1" datatype="int"/>
-				</sequential>
-			</for>
-
-			<if>
-				<istrue value="@{create}"/>
-				<then>
-					<if>
-						<available file="${basedir}/build.xml"/>
-						<then>
-							<echo message="${basedir}/build.xml was not generated as it already exists!"/>
-							<echo message="Run the 'listimport' target to print the relative import info for this directory."/>
-							<fail message="build.xml file already exists in this directory!"/>
-						</then>
-						<else>
-							<echoxml file="${basedir}/build.xml">
-								<project name="put_project_name_here" basedir="." 
-                             default="usage">
-									<!-- IMPORTS -->
-									<import file="${newval}bin/xml/ts.import.xml"/>
-								</project>
-							</echoxml>
-							<echo message="Created ${basedir}/build.xml with the following contents."/>
-							<echo message="Please add an appropriate project name and (if applicable) provide an implementation of the package target."/>
-						</else>
-					</if>
-				</then>
-				<else>
-					<echo message="Build file import info for ${basedir} is..."/>
-				</else>
-			</if>
-			<echo message="-----------------------------------------------"/>
-			<echoxml>
-				<project name="put_project_name_here" basedir="." 
-                     default="usage">
-					<!-- IMPORTS -->
-					<import file="${newval}bin/xml/ts.import.xml"/>
-				</project>
-			</echoxml>
-			<echo message="-----------------------------------------------"/>
-		</sequential>
-	</macrodef>
-
-	<macrodef name="determine.vehicles">
-
-		<!-- 
-        The determine.vehicles task examines the 
-        TS_HOME/src/com/sun/ts/lib/harness/vehicle.properties file and
-        determines which vehicles a test, or set of tests, must be built for and executed in.
-        After this task is invoked the list of vehicles is contained in the property ${vehicles}.
-        Users can examine this space delimted list to see the names of the vehicles that the
-        current test should be built and run for.
-
-        In most cases users should not call this task directly.  The ts.vehicles task invokes
-        this task to determine which vehicles a given test should be built for.  In some rare
-        circumstances, users may invoke this task directly, if for example thay have specific
-        tasks that need to be invoked for specific vehicles.
-
-        Examples:
-
-        <target name="print.vehicles">
-          <determine.vehicles/>
-          <var name="counter" value="1"/>
-          <for list="${vehicles}" param="vehicle" delimiter=" ">
-           <sequential>
-             <echo message="vehicle name ${counter}: @{vehicle}"/>
-             <math result="counter" operand1="${counter}" operation="+" operand2="1" datatype="int"/>
-           </sequential>
-          </for>
-        </target>
-
-        The example above invokes the determine.vehicles task and prints the vehicles found
-        for the current test.
-
-      -->
-
-		<sequential>
-			<var name="vehicle.prop.name" value=""/>
-			<!--  This is an ant based version of the VehicleVerifier  -->
-			<for list="${pkg.dir}" param="token" delimiter="/\">
-				<sequential>
-					<ts.verbose message="vehicle.prop.name = ${vehicle.prop.name}"/>
-
-					<if>
-						<equals arg1="${vehicle.prop.name}" arg2=""/>
-						<then>
-							<var name="vehicle.prop.name" value="@{token}"/>
-						</then>
-						<else>
-							<var name="vehicle.prop.name" 
-                     value="${vehicle.prop.name}/@{token}"/>
-						</else>
-					</if>
-
-					<if>
-						<isset property="${vehicle.prop.name}"/>
-						<then>
-							<propertycopy name="vehicles" 
-                      from="${vehicle.prop.name}"  
-                      silent="true"
-                      override="true"/>
-							<ts.verbose message="vehicle.prop.name, ${vehicle.prop.name} is set to:   ${vehicles}"/>
-						</then>
-						<else>
-							<ts.verbose message="vehicle.prop.name, ${vehicle.prop.name} is not set.  Vehicles still set to:  ${vehicles}"/>
-						</else>
-					</if>
-				</sequential>
-			</for>
-		</sequential>
-	</macrodef>
-
-	<macrodef name="determine.if.rebuildable">
-
-		<!-- 
-        The determine.if.rebuildable task examines the TS_HOME/src/com/sun/ts/lib/harness/rebuildable.properties file
-        and determines if a test directory is meant to be rebuilt by licensees as part of
-        running the tck.  After this task is invoked, the value contained in the 
-        property ${is.rebuildable.dir} will either be set to true or false.  
-        All test dirs default to not being rebuildable unless explictly specified 
-        in TS_HOME/src/rebuildable.properties.
-
-        In most cases users should not call this task directly.
-
-        Examples:
-
-        <target name="print.rebuildable">
-          <determine.if.rebuildable/>
-          <if>
-              <istrue value="@{is.rebuildable.dir}"/>
-            <then>
-              <echo message="This directory contains rebuildable tests"/>
-            </then>
-            <else>
-              <echo message="This directory does not contain rebuildable tests"/>
-            </else>
-          </if>
-        </target>
-
-        The example above invokes the determine.if.rebuildable task and echos a message
-        based on its value.
-
-      -->
-
-		<sequential>
-			<if>
-				<not>
-					<equals arg1="${saved.pkg.dir}" arg2="${pkg.dir}"/>
-				</not>
-				<then>
-					<var name="saved.pkg.dir" value="${pkg.dir}"/>
-					<var name="rebuildable.prop.name" value=""/>
-					<var name="rebuildable" value="false"/>
-
-					<!--  This is an ant based version of the VehicleVerifier  -->
-					<for list="${pkg.dir}" param="token" delimiter="/\">
-						<sequential>
-							<if>
-								<equals arg1="${rebuildable.prop.name}" arg2=""/>
-								<then>
-									<var name="rebuildable.prop.name" value="rebuildable.@{token}"/>
-								</then>
-								<else>
-									<var name="rebuildable.prop.name" 
-                         value="${rebuildable.prop.name}/@{token}"/>
-								</else>
-							</if>
-
-							<ts.verbose message="rebuildable.prop.name = ${rebuildable.prop.name}"/>
-
-							<if>
-								<isset property="${rebuildable.prop.name}"/>
-								<then>
-									<propertycopy name="rebuildable" 
-                          from="${rebuildable.prop.name}"  
-                          silent="true"
-                          override="true"/>
-									<ts.verbose message="rebuildable.prop.name, ${rebuildable.prop.name} is set to:   ${rebuildable}"/>
-								</then>
-								<else>
-									<ts.verbose message="rebuildable.prop.name, ${rebuildable.prop.name} is not set.  Directory is rebuildable?:  ${rebuildable}"/>
-								</else>
-							</if>
-						</sequential>
-					</for>
-					<echo message="Directory, ${pkg.dir} is rebuildable: ${rebuildable}"/>
-				</then>
-			</if>
-		</sequential>
-	</macrodef>
-
-	<macrodef name="determine.commonarchives">
-
-		<!--
-        The determine.commonarchives task examines the
-        TS_HOME/src/com/sun/ts/lib/harness/commonarchives.properties file
-        and determines the common archives associated with a given test
-        directory.  After this task is invoked, the value contained in the
-        property ${is.rebuildable.dir} will either be set to true or false.
-        All test dirs default to not being rebuildable unless explictly specified
-        in TS_HOME/src/rebuildable.properties.
-
-        In most cases users should not call this task directly.
-
-        Examples:
-
-        <target name="print.rebuildable">
-          <determine.if.rebuildable/>
-          <if>
-              <istrue value="@{is.rebuildable.dir}"/>
-            <then>
-              <echo message="This directory contains rebuildable tests"/>
-            </then>
-            <else>
-              <echo message="This directory does not contain rebuildable tests"/>
-            </else>
-          </if>
-        </target>
-
-        The example above invokes the determine.if.rebuildable task and echos a message
-        based on its value.
-
-      -->
-
-		<sequential>
-			<if>
-				<not>
-					<equals arg1="${saved.pkg.dir}" arg2="${pkg.dir}"/>
-				</not>
-				<then>
-					<var name="saved.pkg.dir" value="${pkg.dir}"/>
-					<var name="commonarchives.prop.name" value=""/>
-					<var name="commonarchives" value="false"/>
-
-					<!--  This is an ant based version of the CommonAppVerifier  -->
-					<for list="${pkg.dir}" param="token" delimiter="/\">
-						<sequential>
-							<if>
-								<equals arg1="${commonarchives.prop.name}" arg2=""/>
-								<then>
-									<var name="commonarchives.prop.name" value="commonarchives.@{token}"/>
-								</then>
-								<else>
-									<var name="commonarchives.prop.name"
-                         value="${commonarchives.prop.name}/@{token}"/>
-								</else>
-							</if>
-
-							<ts.verbose message="commonarchives.prop.name = ${commonarchives.prop.name}"/>
-
-							<if>
-								<isset property="${commonarchives.prop.name}"/>
-								<then>
-									<propertycopy name="commonarchives"
-                          from="${commonarchives.prop.name}"
-                          silent="true"
-                          override="true"/>
-									<ts.verbose message="commonarchives.prop.name, ${commonarchives.prop.name} is set to:   ${commonarchives}"/>
-								</then>
-								<else>
-									<ts.verbose message="commonarchives.prop.name, ${commonarchives.prop.name} is not set.  Directory is commonarchives?:  ${commonarchives}"/>
-								</else>
-							</if>
-						</sequential>
-					</for>
-					<echo message="Common archives prop for ${pkg.dir} is set to:  ${commonarchives}"/>
-				</then>
-			</if>
-		</sequential>
-	</macrodef>
-
-	<macrodef name="ts.clean">
-
-		<!-- 
-          The clean task is used when cleaning dist and classes directories based on the
-          attributes supplied.  The default behavior is to delete all files under 
-          ${class.dir}/${pkg.dir} and ${dist.dir}/${pkg.dir}.
-        -->
-		<attribute name="classdir"
-                   default="${class.dir}/${pkg.dir}"
-                   description="The default directory to clean classes from"/>
-		<attribute name="distdir"
-                   default="${dist.dir}/${pkg.dir}"
-                   description="The default directory to clean archives from"/>
-
-		<element name="additional-classes" implicit="yes" optional="true" 
-                 description="Extra class files to be cleaned"/>
-
-		<sequential>
-			<delete failonerror="false" includeEmptyDirs="true">
-				<fileset dir="@{classdir}"/>
-				<additional-classes/>
-			</delete>
-
-			<if>
-				<istrue value="${build.vi}"/>
-				<then>
-					<delete failonerror="false" includeEmptyDirs="true">
-						<fileset dir="@{distdir}" 
-                         includes="**/${vi.build.string}_*"/>
-					</delete>
-				</then>
-				<else>
-					<delete failonerror="false" includeEmptyDirs="true">
-						<fileset dir="@{distdir}" 
-                         excludes="**/${vi.build.string}_*"/>
-					</delete>
-				</else>
-			</if>
-		</sequential>
-	</macrodef>
-
-	<macrodef name="ts.clean.dist">
-
-		<!-- 
-          The clean task is used when cleaning only dist directories based on the
-          attribute supplied.  The default behavior is to delete all files under 
-          ${dist.dir}/${pkg.dir}.
-        -->
-		<attribute name="distdir"
-                   default="${dist.dir}/${pkg.dir}"
-                   description="The default directory to clean archives from"/>
-
-		<sequential>
-			<if>
-				<istrue value="${build.vi}"/>
-				<then>
-					<delete failonerror="false" includeEmptyDirs="true">
-						<fileset dir="@{distdir}" 
-                         includes="**/${vi.build.string}_*"/>
-					</delete>
-				</then>
-				<else>
-					<delete failonerror="false" includeEmptyDirs="true">
-						<fileset dir="@{distdir}" 
-                         excludes="**/${vi.build.string}_*"/>
-					</delete>
-				</else>
-			</if>
-		</sequential>
-	</macrodef>
-
-	<macrodef name="_component">
-
-		<!--
-      The _component task creates application component archives as well as application archives.
-      This task should never be called by users.  This task is leveraged by the component
-      archive tasks as well as the application archive task.
-
-      This task supports the build.level defined in the ts.jte.  The build levels are:
-       1: compile only
-       2: compile and build component archives (e.g., jar's, war's)
-       3: compile and build component and application archives (default value)
-    -->
-
-		<attribute name="descriptor"
-                   default=""        
-                   description="Deployment descriptor if there is one"/>
-
-		<attribute name="permissionsdescriptor"
-                   default=""        
-                   description="Permisssions descriptor added to the archive if the archive requires a deployment descriptor"/>
-        
-                <attribute name="manifest"
-                   default=""
-                   description="Manifest to be used within the archive"/>
-
-		<attribute name="archivename"   
-                   description="Archive name minus the file suffix"/>
-
-		<!--Attributes defined only by presetdefs and other attributes-->
-		<attribute name="archivesuffix"    
-                   description="Suffix for the archive name"/>
-
-		<attribute name="archivefile"
-                   default="${dist.dir}/${pkg.dir}/@{archivename}@{archivesuffix}"    
-                   description="Full path to archive to be created"/>
-
-		<attribute name="descriptordir"
-                   default="${src.dir}/${pkg.dir}"
-                   description="Directory containing the deployment descriptor"/>
-
-		<attribute name="permissionsdescriptordir"
-                   default="${src.dir}/${pkg.dir}"
-                   description="Directory containing the permissions descriptor"/>               
-        
-                <attribute name="internaldescriptorname"
-                   description="Descriptor path and name within the archive"/>
-
-                <attribute name="internalpermissionsdescriptorname"
-                   default="META-INF/permissions.xml"
-                   description="Permissions descriptor path and name within the archive"/>
-
-		<attribute name="update"
-                   default="false"
-                   description="Update an archive if it exists"/>
-
-		<attribute name="mainclass"
-                   default=""    
-                   description="main-class MANIFEST entry for the appclient archive"/>
-
-		<element name="jar-elements" implicit="yes"
-                 description="The content to be added to the archive"/>
-
-		<sequential>
-			<if>
-				<or>
-					<equals arg1="${build.level}" arg2="3"/>
-					<equals arg1="${build.level}" arg2="2"/>
-				</or>
-				<then>
-					<var name="final.archive.file" value="@{archivefile}"/>
-					<if>
-						<istrue value="${build.vi}"/>
-						<then>
-							<determine.if.rebuildable/>
-							<if>
-								<istrue value="${rebuildable}"/>
-								<then>
-									<var name="final.archive.file" 
-                             value="${dist.dir}/${pkg.dir}/${vi.build.string}_@{archivename}@{archivesuffix}"/>
-								</then>
-							</if>
-						</then>
-					</if>
-
-					<ts.verbose message="pkg.dir:                    ${pkg.dir}"/>
-					<ts.verbose message="descriptor:                 @{descriptor}"/>
-					<ts.verbose message="descriptordir:              @{descriptordir}"/>
-					<ts.verbose message="permissionsdescriptor:      @{permissionsdescriptor}"/>
-					<ts.verbose message="permissionsdescriptordir:   @{permissionsdescriptordir}"/>
-					<ts.verbose message="manifest:                   @{manifest}"/>
-					<ts.verbose message="archivename:                @{archivename}"/>
-					<ts.verbose message="archivefile:                ${final.archive.file}"/>
-					<ts.verbose message="internaldescriptorname:     @{internaldescriptorname}"/>
-					<ts.verbose message="internalpermissionsdescriptorname:     @{internaldescriptorname}"/>
-					<ts.verbose message="archivesuffix:              @{archivesuffix}"/>
-					<ts.verbose message="deliverable.class:          ${deliverable.class}"/>
-
-					<!--Define presets for the jar command for Java EE archives-->
-
-					<if>
-						<isset property="create.manifest.extension.entries"/>
-						<then>
-							<if>
-								<isset property="tslib.name"/>
-								<then>
-									<presetdef name="preservejar">
-										<jar destfile="${final.archive.file}" duplicate="preserve"
-                             update="@{update}">
-											<manifest>
-												<attribute name="Extension-List" 
-                                       value="tsharness ${tslib.name}"/>
-												<attribute name="tsharness-Extension-Name" 
-                                       value="tsharness"/>
-												<attribute name="tsharness-Specification-Version" 
-                                       value="${extension.lib.version}"/>
-												<attribute name="tsharness-Implementation-Version" 
-                                       value="${extension.lib.version}"/>
-												<attribute name="tsharness-Implementation-Vendor-Id" 
-                                       value="com.sun"/>
-												<attribute name="${tslib.name}-Extension-Name" 
-                                       value="${tslib.name}"/>
-												<attribute name="${tslib.name}-Specification-Version" 
-                                       value="${extension.lib.version}"/>
-												<attribute name="${tslib.name}-Implementation-Version" 
-                                       value="${extension.lib.version}"/>
-												<attribute name="${tslib.name}-Implementation-Vendor-Id" 
-                                       value="com.sun"/>
-											</manifest>
-										</jar>
-									</presetdef>
-								</then>
-								<else>
-									<presetdef name="preservejar">
-										<jar destfile="${final.archive.file}" 
-                                 duplicate="preserve"
-                                 update="@{update}">
-											<manifest>
-												<attribute name="Extension-List" 
-                                           value="tsharness"/>
-												<attribute name="tsharness-Extension-Name" 
-                                           value="tsharness"/>
-												<attribute name="tsharness-Specification-Version" 
-                                           value="${extension.lib.version}"/>
-												<attribute name="tsharness-Implementation-Version" 
-                                           value="${extension.lib.version}"/>
-												<attribute name="tsharness-Implementation-Vendor-Id" 
-                                           value="com.sun"/>
-											</manifest>
-										</jar>
-									</presetdef>
-								</else>
-							</if>
-						</then>
-						<else>
-							<presetdef name="preservejar">
-								<jar destfile="${final.archive.file}" duplicate="preserve"
-                            update="@{update}"/>
-							</presetdef>
-						</else>
-					</if>
-
-					<mkdir dir="${dist.dir}/${pkg.dir}"/>
-
-					<!--Add the descriptor if necessary, else create the archive-->
-					<if>
-						<not>
-							<equals arg1="@{descriptor}" arg2="" />
-						</not>
-						<then>
-							<preservejar>
-								<jar-elements/>
-								<zipfileset dir="@{descriptordir}"
-                                 includes="@{descriptor}"
-                                 fullpath="@{internaldescriptorname}"/>
-							</preservejar>
-						</then>
-						<else>
-							<preservejar>
-								<jar-elements/>
-							</preservejar>
-						</else>
-					</if>
-
-					<!--Add the permissions descriptor if necessary-->
-					<if>
-						<not>
-							<equals arg1="@{permissionsdescriptor}" arg2="" />
-						</not>
-						<then>
-							<preservejar update="true">
-								<jar-elements/>
-								<zipfileset dir="@{permissionsdescriptordir}"
-                                 includes="@{permissionsdescriptor}"
-                                 fullpath="@{internalpermissionsdescriptorname}"/>
-							</preservejar>
-						</then>						
-					</if>
-                                        
-                                        <!--Add the client class to the manifest if we are in an 
-                    appclient jar-->
-					<if>
-						<not>
-							<equals arg1="@{mainclass}" arg2="" />
-						</not>
-						<then>
-							<preservejar destfile="${final.archive.file}"
-                                     update="true">
-								<manifest>
-									<attribute name="main-class" 
-                                           value="@{mainclass}"/>
-								</manifest>
-
-							</preservejar>
-						</then>
-					</if>
-
-					<!--Add the custom manifest to built jar if necessary-->
-					<if>
-						<not>
-							<equals arg1="@{manifest}" arg2="" />
-						</not>
-						<then>
-							<preservejar manifest="@{manifest}"
-                                     update="true"/>
-						</then>
-					</if>
-
-					<echo message="Copying sun runtime file to dist"/>
-
-					<if>
-						<and>
-							<istrue value="${rebuildable}"/>
-							<istrue value="${build.vi}"/>
-						</and>
-						<then>
-							<copy todir="${dist.dir}/${pkg.dir}"
-                          failonerror="false">
-								<fileset dir="${basedir}"
-                                 includes="@{archivename}@{archivesuffix}.sun-*.xml"/>
-								<globmapper from="*" to="${vi.build.string}_*"/>
-							</copy>
-
-							<copy todir="${dist.dir}/${pkg.dir}"
-                          failonerror="false">
-								<fileset dir="${ts.home}/tmp"
-                                 includes="@{archivename}@{archivesuffix}.sun-*.xml"/>
-								<globmapper from="*" to="${vi.build.string}_*"/>
-							</copy>
-
-							<!--<replace dir="${dist.dir}/${pkg.dir}"
-                             includes="${vi.build.string}_*@{archivename}@{archivesuffix}.sun-*.xml">
-                        <replacetoken><![CDATA[<web-uri>@{archivename}]]></replacetoken>
-                        <replacevalue><![CDATA[<web-uri>vi_built_@{archivename}]]></replacevalue>
-                    </replace>
-        -->
-						</then>
-						<else>
-							<copy todir="${dist.dir}/${pkg.dir}"
-                          failonerror="false">
-								<fileset dir="${basedir}"
-                                 includes="@{archivename}@{archivesuffix}.sun-*.xml"/>
-							</copy>
-							<copy todir="${dist.dir}/${pkg.dir}"
-                          failonerror="false">
-								<fileset dir="${ts.home}/tmp"
-                                 includes="@{archivename}@{archivesuffix}.sun-*.xml"/>
-							</copy>
-						</else>
-					</if>
-					<delete>
-						<fileset dir="${ts.home}/tmp" includes="*@{archivename}@{archivesuffix}.sun-*.xml"
-                             excludes="*ear.sun-application*"/>
-					</delete>
-				</then>
-				<else>
-					<echo message="*** ts.common.xml: build.level is set to ${build.level}" />
-					<echo message="*** ts.common.xml: packaging will not be executed" />
-				</else>
-			</if>
-
-		</sequential>
-	</macrodef>
-
-
-	<!--
-      These properties are passed to the verifier macrodef by the verify targets in
-      bin/build.xml and ts.import.xml.  They are declared here so they can be reused
-      in both files, since both files include this file.  We also use props so users
-      can override the default values if they choose to do so when invoking the
-      verifier from the command line.
-    -->
-	<property name="verifierresultsdir" value="${ts.home}/tmp"/>
-	<property name="verifierarchivedir" value="${ts.home}/dist/${pkg.dir}"/>
-	<property name="verifierdefaultincludes"
-              value="**/*.ear, **/*.war, **/*.jar, **/*.rar, **/*.par, **/*.car"/>
-	<property name="verifierfailonerror" value="false"/>
-	<property name="verifiersaveresults" value="false"/>
-
-	<macrodef name="verifier">
-		<!--
-        The verifier task allows users to run the verify utility included with the Sun appserver.
-        Invoking this task runs the verifier script in the ${javaee.home.ri}/bin directory.  Results
-        are written to the directory specified by the resultsdir attribute.  Users can specify a
-        resultsdir or use the default which is set to ${ts.home}/tmp.  Note, if the
-        specified results directory does not exist, it is created.  If it does exist, its contents
-        are deleted unless saveresults is set to true.  If saveresults is true the results are copied
-        to a time stamped backup directory before running the verifier.
-
-        Users can invoke this task by invoking the verifier task in their Ant build files.  Users
-        may also invoke the verifier task by invoking the verify target that lives in ts.import.xml
-        as well as bin/build.xml.   Both of these Ant build files import this file (ts.common.xml).
-        This gives users two ways to invoke the verifier, from within an Ant build file using this
-        task definition or from the command line invoking the verify target which calls this task.
-
-        When invoking the verify target from the command line users can override the following
-        properties.  These properties are passed to the attributes of this task and are defaulted
-        to the same values as the task attributes.  This provides users a way to override the
-        default attribute values when invoking the verifier task on the command line using the
-        verify target.
-
-        verifierresultsdir: directory to store results in, passed to the resultsdir
-                            attribute of this task
-
-        verifierarchivedir: base directory to search for archives to verify, passed to the
-                            archivedir attribute of this task
-
-        verifierdefaultincludes: the filters used to find archives files to verify, passed to the
-                                 defaultincludes attribute of this task
-
-        verifierfailonerror: stop the verifier from running as soon as a single archive fails
-                             the verifier, meaning an error or failure is encountered, warnings
-                             will not stop the verifier run
-
-        verifiersaveresults: save the previous verifier results if they exist, they will be
-                             moved to a directory named verifier-results-backup-<timestamp>
-
-
-        Examples:
-
-        <verifier/>
-
-        This example runs the verifier task using the default attribute settings.  This xml fragment
-        would appear in an Ant build file.
-
-        This command line invocation does the exact same thing as the xml fragment above.  The verifier
-        will validate the archives (application and component) found in the associated dist directory
-        relative to the current source directory:
-
-          $ANT_HOME/bin/ant verify
-
-        If this command were invoked from $TS_HOME/src/com/sun/ts/tests/samples the verifier would
-        run against all the archives found under $TS_HOME/dist/com/sun/ts/tests/samples.
-
-
-
-        <verifier resultsdir="/tmp"
-                  defaultincludes="*.ear"
-                  failonerror="true"
-                  saveresults="true"/>
-        
-        This example runs the verifier task with the user specified attributes.  In this case the
-        verifier results will be written to /tmp/verifier-results.  The task always appends
-        the verifier-results directory to the specified results directory so the results are always
-        in their own directory.  In this case the user has opted to only run the verifier on application
-        archives (ears only, component archives are skipped).  Since the user specified a value of true
-        for failonerror, this task will terminate if the verifier finds an application archive with an
-        error or failure.  The task will continue to execute if the verifier finds warnings.  Since
-        saveresults is true, if the directory /tmp/verifier-results exists its contents will be copied
-        to /tmp/verifier-results-backup-<timestamp>.  This xml fragment should be placed in an Ant build
-        file.
-
-        The following command line invocation does exactly what the xml fragment above does:
-
-          $ANT_HOME/bin/ant -Dverifierresultsdir=/tmp -Dverifierdefaultincludes="*.ear" \
-                             -Dverifierfailonerror=true -Dverifiersaveresults=true
-
-        If this command were invoked from $TS_HOME/src/com/sun/ts/tests/samples the verifier would
-        run against all the application archives (ear files) found under
-        $TS_HOME/dist/com/sun/ts/tests/samples.
-
-
-
-        $ANT_HOME/bin/ant -Dverifierarchivedir=${ts.home}/dist/com/sun/ts/samples verify
- 
-        This example runs the verifer from the command line on any application or component archives
-        found under ${ts.home}/dist/com/sun/ts/samples no matter what directory the user is located
-        in when they invoke ant.  Not sure this attribute should ever be overridden by a user but
-        if someone thinks of an appropriate use case then by all means override this attribute.  I
-        suppose invoking the verify target from a script may be easier using this attribute instead
-        of cd'ing into the respective source directory then invoking the verify target.
-        
-      -->
-
-		<attribute name="resultsdir"
-                 default="${ts.home}/tmp"
-                 description="The directory used to store verifier results, verifier-results will be appended to this directory"/>
-
-		<attribute name="archivedir"
-                 default="${ts.home}/dist/${pkg.dir}"
-                 description="The base directory containing the archives to be verified"/>
-
-		<attribute name="defaultincludes"
-                 default="**/*.ear, **/*.war, **/*.jar, **/rar, **/*.par, **/*.car"
-                 description="The default filter used to find archives for verification relative to the archivedir"/>
-
-		<attribute name="failonerror"
-                 default="false"
-                 description="Stops the verification process if any archive fails verification, meaning if the verifier finds an error or a failure it terminates the task"/>
-
-		<attribute name="saveresults"
-                 default="false"
-                 description="If the specified results directory exists it will be moved to save the previous results,  the saved directory will be named verifier-results-backup-[timestamp]"/>
-
-
-		<sequential>
-			<property name="resultsdirectory" value="@{resultsdir}/verifier-results"/>
-			<var name="total.errors"   value="0"/>
-			<var name="total.failures" value="0"/>
-			<var name="total.warnings" value="0"/>
-			<var name="unique.counter" value="0"/>
-			<tstamp>
-				<format property="last.updated" pattern="MM/dd/yyyy hh:mm aa"/>
-			</tstamp>
-			<tstamp>
-				<format property="backup.stamp" pattern="MM-dd-yyyy-hh:mm:ss"/>
-			</tstamp>
-
-			<!-- If the specified results directory doesn't exist, create it.  If it does exist and   -->
-			<!-- saveresults is true, backup the current results by saving them to a backup directory -->
-			<!-- with an appropriate time stamp.  If the results directory exists and saveresults is  -->
-			<!-- false simply delete the contents of the results directory.                           -->
-			<if>
-				<available file="${resultsdirectory}" type="dir"/>
-				<then>
-					<if>
-						<istrue value="@{saveresults}"/>
-						<then>
-							<move todir="@{resultsdir}/verifier-results-backup-${backup.stamp}">
-								<fileset dir="${resultsdirectory}" includes="**/*"/>
-							</move>
-						</then>
-						<else>
-							<delete includeemptydirs="true">
-								<fileset dir="${resultsdirectory}" includes="**/*"/>
-							</delete>
-						</else>
-					</if>
-				</then>
-				<else>
-					<mkdir dir="${resultsdirectory}"/>
-				</else>
-			</if>
-
-			<!-- create an index file with the verifier results -->
-			<touch file="${resultsdirectory}/index.html"/>
-			<echo append="true" file="${resultsdirectory}/index.html">
-				<![CDATA[
-            <html>
-				<head>
-					<meta content="text/html; charset=ISO-8859-1"
-                      http-equiv="content-type">
-						<title>@{archivedir}</title>
-					</head>
-					<body>
-						<center>
-							<big>
-								<big>Verifier Results for @{archivedir}</big>
-							</big>
-						</center>
-						<br>
-							<hr style="width: 100%; height: 2px;">
-          ]]>
-        </echo>
-
-							<!-- process each archive -->
-							<for param="archive">
-								<fileset dir="@{archivedir}"
-                   includes="@{defaultincludes}"
-                   excludes="**/ts_dep/*"/>
-								<sequential>
-									<propertyregex property="archive.name.only"
-              input="@{archive}"
-              regexp=".*[\/|\\](.*)"
-              select="\1"
-              casesensitive="false"
-              override="true"/>
-									<propertyregex property="relative.archive.name"
-              input="@{archive}"
-              regexp=".*[\/|\\]dist[\/|\\](.*)"
-              select="\1"
-              casesensitive="false"
-              override="true"/>
-
-									<!-- run the verifier -->
-									<echo message="${line.separator}${line.separator}*****************************************************"/>
-									<echo message="*****************************************************"/>
-									<echo message="*****************************************************"/>
-									<echo message="*** Verifying &quot;@{archive}&quot;"/>
-									<echo message="*** Results written to &quot;${resultsdirectory}&quot;"/>
-
-									<if>
-										<os family="windows"/>
-										<then>
-											<exec executable="cmd.exe">
-												<arg line=" /c"/>
-												<arg line="${javaee.home.ri}/bin/verifier"/>
-												<arg line="-ra"/>
-												<arg line="-p"/>
-												<!-- -p for portable archive check, not Sun speciifc -->
-												<arg line="-d ${resultsdirectory}"/>
-												<arg line="@{archive}"/>
-											</exec>
-										</then>
-										<else>
-											<exec executable="${javaee.home.ri}/bin/verifier">
-												<arg line="-ra"/>
-												<arg line="-p"/>
-												<!-- -p for portable archive check, not Sun speciifc -->
-												<arg line="-d ${resultsdirectory}"/>
-												<arg line="@{archive}"/>
-											</exec>
-										</else>
-									</if>
-
-									<!--
-              Load the resulting XML file to get the counts for failures, warnings and errors.
-              We need to prefix each attribute with a unique ID since property values can not
-              be reset in Ant.  We use the full archive name and path since this is guaranteed
-              to be unique.  We then use ant-contrib's propertycopy to get the counts.  These
-              property values can be overridden.
-            -->
-									<echo message="*** Loading Result XML File &quot;${resultsdirectory}/${archive.name.only}.xml&quot;"/>
-									<xmlproperty prefix="@{archive}" file="${resultsdirectory}/${archive.name.only}.xml"/>
-									<propertycopy property="errors" override="true"
-                          from="@{archive}.static-verification.failure-count.error-number"/>
-									<propertycopy property="failures" override="true"
-                          from="@{archive}.static-verification.failure-count.failure-number"/>
-									<propertycopy property="warnings" override="true"
-                          from="@{archive}.static-verification.failure-count.warning-number"/>
-
-									<!-- Move the result files so they have a unique id across all of spider -->
-									<math result="unique.counter" operand1="${unique.counter}"
-                  operation="+" operand2="1"
-                  datatype="int"/>
-									<move file="${resultsdirectory}/${archive.name.only}.xml"
-                  tofile="${resultsdirectory}/${unique.counter}-${archive.name.only}.xml"/>
-									<move file="${resultsdirectory}/${archive.name.only}.txt"
-                  tofile="${resultsdirectory}/${unique.counter}-${archive.name.only}.txt"/>
-									<var name="unique.archive.name.only" value="${unique.counter}-${archive.name.only}"/>
-
-									<!-- Add a message to the index file noting the overall staus of an archive.  If -->
-									<!-- we are in fail fast mode we finish the index.html file and exit the ant run -->
-									<!-- when we see an error or failure.                                            -->
-									<if>
-										<!-- We have errors -->
-										<not>
-											<equals arg1="${errors}" arg2="0"/>
-										</not>
-										<then>
-											<echo append="true" file="${resultsdirectory}/index.html">
-												<![CDATA[<span style="color: rgb(51, 51, 255);">Errors</span>&nbsp]]>
-                </echo>
-										<if>
-											<istrue value="@{failonerror}"/>
-											<then>
-												<echo append="true" file="${resultsdirectory}/index.html">
-                      (${relative.archive.name})  -  Detailed Results: 
-                      <![CDATA[<a href="${unique.archive.name.only}.html">html</a>&nbsp]]>
-                      <![CDATA[<a href="${unique.archive.name.only}.xml">xml</a>&nbsp]]>
-                      <![CDATA[<a href="${unique.archive.name.only}.txt">text</a>
-										<br>]]>
-                    </echo>
-										<echo append="true" file="${resultsdirectory}/index.html">
-											<![CDATA[<hr style="width: 100%; height: 2px;">
-                      This file was generated on ${last.updated}.</body>
-									</html>]]>
-                    </echo>
-								<fail message="*** Errors found in archive &quot;@{archive}&quot;, verification terminated. ***"/>
-							</then>
-						</if>
-					</then>
-					<elseif>
-						<!-- We have failures -->
-						<not>
-							<equals arg1="${failures}" arg2="0"/>
-						</not>
-						<then>
-							<echo append="true" file="${resultsdirectory}/index.html">
-								<![CDATA[<span style="color: rgb(255, 0, 0);">Failures</span>&nbsp]]>
-                  </echo>
-						<if>
-							<istrue value="@{failonerror}"/>
-							<then>
-								<echo append="true" file="${resultsdirectory}/index.html">
-                        (${relative.archive.name})  -  Detailed Results: 
-                        <![CDATA[<a href="${unique.archive.name.only}.html">html</a>&nbsp]]>
-                        <![CDATA[<a href="${unique.archive.name.only}.xml">xml</a>&nbsp]]>
-                        <![CDATA[<a href="${unique.archive.name.only}.txt">text</a>
-						<br>]]>
-                      </echo>
-						<echo append="true" file="${resultsdirectory}/index.html">
-							<![CDATA[<hr style="width: 100%; height: 2px;">
-                        This file was generated on ${last.updated}.</body>
-					</html>]]>
-                      </echo>
-				<fail message="*** Failures found in archive &quot;@{archive}&quot;, verification terminated. ***"/>
-			</then>
-		</if>
-	</then>
-</elseif>
-<elseif>
-	<!-- We have warnings -->
-	<not>
-		<equals arg1="${warnings}" arg2="0"/>
-	</not>
-	<then>
-		<echo append="true" file="${resultsdirectory}/index.html">
-			<![CDATA[<span style="color: rgb(255, 204, 0);">Warnings</span>&nbsp]]>
-                  </echo>
-</then>
-</elseif>
-<else>
-<!-- all is well -->
-<echo append="true" file="${resultsdirectory}/index.html">
-	<![CDATA[<span style="color: rgb(0, 153, 0);">Passed</span>&nbsp]]>
-                </echo>
-</else>
-</if>
-
-<!-- Add the links to the three flavors of results files -->
-<echo append="true" file="${resultsdirectory}/index.html">
-               (${relative.archive.name})  -  Detailed Results: 
-               <![CDATA[<a href="${unique.archive.name.only}.html">html</a>&nbsp]]>
-               <![CDATA[<a href="${unique.archive.name.only}.xml">xml</a>&nbsp]]>
-               <![CDATA[<a href="${unique.archive.name.only}.txt">text</a>
-<br>]]>
-            </echo>
-
-<!-- Update total errors, failures and warnings -->
-<math result="total.errors" operand1="${total.errors}"
-                  operation="+" operand2="${errors}"
-                  datatype="int"/>
-<math result="total.failures" operand1="${total.failures}"
-                  operation="+" operand2="${failures}"
-                  datatype="int"/>
-<math result="total.warnings" operand1="${total.warnings}"
-                  operation="+" operand2="${warnings}"
-                  datatype="int"/>
-
-</sequential>
-</for>
-
-<!-- end the index file -->
-<echo append="true" file="${resultsdirectory}/index.html">
-<![CDATA[<hr style="width: 100%; height: 2px;">
-          This file was generated on ${last.updated}.</body>
-</html>]]>
-        </echo>
-
-<!-- transform the xml results to html for easy viewing -->
-<echo message="${line.separator}${line.separator}*****************************************************"/>
-<xslt basedir="${resultsdirectory}"
-              destdir="${resultsdirectory}"
-              includes="*.xml"
-              style="${bin.dir}/xml/verifier-results.xsl"/>
-
-<!-- spit out summary results for errors, failures and warnings as well as the index file location -->
-<echo message="${line.separator}${line.separator}********************** Totals ***********************"/>
-<echo message="*****************************************************"/>
-<echo message="** Total Archives Processed : ${unique.counter}"/>
-<echo message="**   Total Errors   : ${total.errors}"/>
-<echo message="**   Total Failures : ${total.failures}"/>
-<echo message="**   Total Warnings : ${total.warnings}"/>
-<echo message="**   See summary file for details"/>
-<echo message="**     &quot;${resultsdirectory}/index.html&quot;"/>
-<echo message="*****************************************************"/>
-<echo message="*****************************************************"/>
-
-</sequential>
-</macrodef>
-
-</project>
diff --git a/bin/xml/ts.ear.xml b/bin/xml/ts.ear.xml
deleted file mode 100644
index 9c1ce028d9..0000000000
--- a/bin/xml/ts.ear.xml
+++ /dev/null
@@ -1,341 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
-    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
-
--->
-
-<project name="Test Import" basedir="." default="usage">
-
-    <!-- IMPORTS -->
-    <import file="./ts.common.xml"/>
-
-    <!-- LOCAL PROPERTY DEFINITIONS -->  
-    
-    <!-- PRESETS -->
-    <!-- MACROS -->    
-    <macrodef name="_delete.component.archives">
-        <sequential>
-        <!--
-             The _delete.component.archives task is a macro that removes all files with 
-             the extensions jar, war, car and rar from the the current 
-             $TS_HOME/${dist.dir}/${pkg.dir}.  This task should not be called directly by 
-             users.  It is currently used by the ts.ear and ts.vehicles tasks.
-        -->
-        
-        <!--
-        <if>
-            <equals arg1="${build.level}" arg2="3"/>
-            <then>
-                <delete failonerror="false">
-                    <fileset dir="${dist.dir}/${pkg.dir}" 
-                        includes="*.jar, *.war, *.car, *.rar"
-                        excludes="*_component*ar"/>
-                </delete>
-           </then>
-        </if>
-        -->
-        </sequential>
-    </macrodef>
-
-    <macrodef name="ts.ear">
-
-    <!--
-        The ts.ear task allows users to build application archives.  By default all
-        component archives under TS_HOME/dist/<pkg.dir> are included in the
-        generated archive.  Component archives have the following file suffixes: jar,
-        war, car, and rar.  After the application archive is created the component
-        archives are delted from TS_HOME/dist/<pkg-dir>.  Users may specify additional
-        content using nested fileset and zipfileset elements.  User may also tweak the
-        contents of the generated archive by specifying various attribute values, see
-        the attribute and element tables for details.
-
-        Examples:
-
-        <ts.ear archivename="ejb_sam_Hello"
-                descriptor="application.xml"/>
-
-        This example builds an application archive named ejb_sam_Hello.ear.  The deployment
-        descriptor in the application archive, application.xml, is specified using the
-        descriptor attribute.  Note, the application.xml file ends up in the application
-        archive as the META-INF/application.xml with no diffs.  Note, in Java EE 5
-        application deployment descriptors are optional.
- 
-
-        <ts.ear archivename="ejb_sam_Hello"
-                descriptor="application.xml"
-                manifest="my-manifest"/>
-
-        This example is the same as the previous example except the user has opted to
-        specify a custom manifest file.  This file becomes the META-INF/MANIFEST.MF file
-        within the application archive.
-
-
-        <ts.ear archivename="ejb_sam_Hello"
-                descriptor="application.xml"
-                manifest="my-manifest">
-          <fileset dir="<some-directory>" includes="<some-file-filter-expression>"/>
-        </ts.ear>
-
-        This example is the same as the previous example except the user has opted
-        to add additional content to the application archive.  Note, users may specify
-        additional content using nested fileset or zipfileset elements.
-
-
-        <ts.ear archivename="ejb_sam_Hello"
-                descriptor="application.xml"
-                manifest="my-manifest"
-                excludedfiles="*.war, *.rar"/>
-        </ts.ear>
-
-        This example excludes all war and rar component archives that live in the
-        TS_HOME/${dist.dir}/${pkg.dir}.  If the TS_HOME/${dist.dir}/${pkg.dir} contained the archives
-        classes A.jar and B.rar, C.jar and D.war only archives A and C would end up in the application
-        archive.  Using the excludedfiles attribute is another way of customizing the content of the
-        archive by excluding some of the default content.  Users can also use the includedefaultfiles
-        attribute to exclude all default content but the user must then use nested filesets and or
-        zipfilesets to include the appropriate content.  Using the excludedfiles attribute may be
-        simpler in some cases.
-
-        To continue this example, the following XML does the exact same thing as the example above
-        but it uses the includedefaultfiles attribute and a nested fileset element.
-
-        <ts.ear archivename="ejb_sam_Hello"
-                descriptor="application.xml"
-                manifest="my-manifest"
-                includedefaultfiles="false">
-          <fileset dir="TS_HOME/${dist.dir}/${pkg.dir}" includes="A.jar, C.jar"/>
-        </ts.ear>
-
-      -->
-
-        <attribute name="descriptor"
-                   default=""        
-                   description="Deployment descriptor added to the archive if the archive requires a deployment descriptor"/>
-                              
-        <attribute name="permissionsdescriptor"
-                   default=""        
-                   description="Permisssions descriptor added to the archive if the archive requires a deployment descriptor"/>
-        
-        <attribute name="manifest"
-                   default=""
-                   description="Manifest to be used in the archive"/>
-        
-        <attribute name="archivename"   
-                   description="Archive name minus the file suffix"/>
-                   
-        <attribute name="descriptordir"
-                   default="${src.dir}/${pkg.dir}"
-                   description="Directory containing the deployment descriptor"/>           
-        
-        <attribute name="permissionsdescriptordir"
-                   default="${src.dir}/${pkg.dir}"
-                   description="Directory containing the permissions descriptor"/>           
-        
-        <attribute name="deletecomponentarchives"
-                   default="true"
-                   description="If set to true, all *.jar, *.par, *.war, *.car, *.rar 
-                                except for files matching *_component*ar
-                                in ${dist.dir}/${pkg.dir} will be deleted after the ear
-                                has been created.  If set to false, no files will
-                                be deleted, and it will be up to the caller of this macro
-                                to clean up the appropriate archives."/>
-                   
-        <attribute name="includedefaultfiles"
-                   default="true"
-                   description="Include default files in the ear"/>
-
-        <attribute name="excludedfiles"
-                   default=""
-                   description="A comma separated list of file expressions to exclude from the set of default included files.  This list of file expressions is relative to the TS_HOME/${dist.dir}/${pkg.dir} directory."/>
-
-        <attribute name="update"
-                   default="false"
-                   description="Update an ear if it exists"/>
-
-        <element name="jar-elements" implicit="yes" optional="true"
-                 description="The content to be added to the archive"/>
-        
-        <sequential>
-        
-        <!-- Define commmon preset regardless of includedefaultfiles value-->
-        <presetdef name="component.ear">
-            <_component descriptor="@{descriptor}"
-                        permissionsdescriptor="@{permissionsdescriptor}"
-                       manifest="@{manifest}"
-                       archivename="@{archivename}"
-                       archivesuffix=".ear"
-                       descriptordir="@{descriptordir}"
-                       permissionsdescriptordir="@{permissionsdescriptordir}"
-                       internaldescriptorname="META-INF/application.xml"
-                       update="@{update}">
-            </_component>
-        </presetdef>
-
-       <if>
-          <equals arg1="${build.level}" arg2="3"/>
-        <then>
-            <if>
-              <istrue value="@{includedefaultfiles}"/>
-            <then>
-                <if>
-                    <and>
-                        <istrue value="${rebuildable}"/>
-                        <istrue value="${build.vi}"/>
-                    </and>
-                    <then>
-
-                        <var name="files.to.package.vi.built" unset="true"/>
-
-                        <pathconvert property="files.to.package.vi.built"
-                             pathsep=",">
-                            <fileset dir="${dist.dir}/${pkg.dir}"
-                               includes="*.jar, *.war, *.car, *.rar"
-                               excludes="@{excludedfiles}"/>
-                            <jar-elements/>
-                            <chainedmapper>
-                                <filtermapper>
-                                    <replacestring from="vi_built_" to=""/>
-                                </filtermapper>
-                                <regexpmapper handledirsep="yes" from="^(.*)/([^/]+)/([^/]*)$$" to="\1/\2/vi_built_\3"/>
-                                <regexpmapper handledirsep="yes" from=".*[\/|\\](.*)" to="\1"/>
-                            </chainedmapper>
-                        </pathconvert>
-
-                        <var name="files.to.package" value="${files.to.package.vi.built}"/>
-
-                        <echo message="files.to.package = ${files.to.package}"/>
-                        
-                        <mkdir dir="${tmp.dir}/@{archivename}.vibuilt"/>
-                        <copy todir="${tmp.dir}/@{archivename}.vibuilt">
-                            <fileset dir="${dist.dir}/${pkg.dir}"
-                                 includes="${files.to.package}">
-                            </fileset>
-                            <filtermapper>
-                                <replacestring from="vi_built_" to=""/>
-                            </filtermapper>
-                        </copy>
-                        <component.ear>
-                            <fileset dir="${tmp.dir}/@{archivename}.vibuilt"
-                                 includes="*">
-                            </fileset>
-                        </component.ear>
-                        <delete dir="${tmp.dir}/@{archivename}.vibuilt" quiet="true"/>
-                    </then>
-                    <else>
-                        <component.ear>
-                            <fileset dir="${dist.dir}/${pkg.dir}"
-                                     includes="*.jar, *.war, *.car, *.rar"
-                                     excludes="@{excludedfiles}, vi_built*"/>
-                            <jar-elements/>
-                        </component.ear>
-                    </else>
-                </if>              
-            </then>
-            <else>
-                <if>
-                    <and>
-                        <istrue value="${rebuildable}"/>
-                        <istrue value="${build.vi}"/>
-                    </and>
-                    <then>
-
-                        <var name="files.to.package.vi.built" unset="true"/>
-                        <pathconvert property="files.to.package.vi.built"
-                             pathsep=",">
-                            <jar-elements/>
-                            <chainedmapper>
-                                <filtermapper>
-                                    <replacestring from="vi_built_" to=""/>
-                                </filtermapper>
-                                <regexpmapper handledirsep="yes" from="^(.*)/([^/]+)/([^/]*)$$" to="\1/\2/vi_built_\3"/>
-                                <regexpmapper handledirsep="yes" from=".*[\/|\\](.*)" to="\1"/>
-                            </chainedmapper>
-                        </pathconvert>
-
-                        <var name="files.to.package" value="${files.to.package.vi.built}"/>
-
-                        <echo message="files.to.package = ${files.to.package}"/>
-
-                        <mkdir dir="${tmp.dir}/@{archivename}.vibuilt"/>
-                        <copy todir="${tmp.dir}/@{archivename}.vibuilt">
-                            <fileset dir="${dist.dir}/${pkg.dir}"
-                                 includes="${files.to.package}">
-                            </fileset>
-                            <filtermapper>
-                                <replacestring from="vi_built_" to=""/>
-                            </filtermapper>
-                        </copy>
-                        <component.ear>
-                            <fileset dir="${tmp.dir}/@{archivename}.vibuilt"
-                                 includes="*">
-                            </fileset>
-                        </component.ear>
-                        <delete dir="${tmp.dir}/@{archivename}.vibuilt" quiet="true"/>
-                    </then>
-                    <else>
-                        <component.ear>
-                            <jar-elements/>
-                        </component.ear>
-                    </else>
-                </if>
-                
-            </else>
-            </if>
-
-            <if>
-                <isset property="keep.archives"/>
-            <then>
-                <delete dir="${dist.dir}/${pkg.dir}/archives" quiet="true"/>
-                <mkdir dir="${dist.dir}/${pkg.dir}/archives"/>
-                <copy todir="${dist.dir}/${pkg.dir}/archives">
-                    <fileset dir="${dist.dir}/${pkg.dir}"
-                             includes="*.jar, *.war, *.rar, *.car"/>
-                </copy>
-                <for param="archive">
-                  <fileset dir="${dist.dir}/${pkg.dir}/archives"
-                           includes="*.jar, *.war, *.rar, *.car"/>
-                  <sequential>
-                    <echo message="Unjarring Archive: @{archive}"/>
-                    <mkdir dir="@{archive}.contents"/>
-                    <unjar src="@{archive}"
-                           dest="@{archive}.contents"/>
-                  </sequential>
-                </for>
-            </then>
-            </if>
-
-            <!--
-            <if>
-                <equals arg1="@{deletecomponentarchives}" arg2="true"/>
-            <then>
-                <_delete.component.archives/>
-            </then>
-            </if>
-            -->
-        </then>
-            <else>
-            <echo message="*** ts.ear.xml: build.level is set to ${build.level}" />
-            <echo message="*** ts.ear.xml: an ear file will not be created" />
-            </else>
-        </if>
-        </sequential>
-    </macrodef>
-    
-    <!-- PRESETS -->
-    
-    <!-- TARGETS -->
-
-</project>
diff --git a/bin/xml/ts.ejbjar.xml b/bin/xml/ts.ejbjar.xml
deleted file mode 100644
index eb9be9268b..0000000000
--- a/bin/xml/ts.ejbjar.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
-    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
-
--->
-
-<project name="EjbjarImport" basedir="." default="usage">
-
-    <!-- IMPORTS -->
-    <import file="./ts.common.xml"/>
-
-    <!-- LOCAL PROPERTY DEFINITIONS -->  
-    
-    <!-- MACROS -->
-    <macrodef name="ts.ejbjar">
-
-    <!--
-        The ts.ejbjar task allows users to build EJB archives.  By default all classes
-        under TS_HOME/classes/<pkg.dir> are included in the generated archive.  Users
-        may specify additional content using nested fileset and zipfileset elements.
-        User may also tweak the contents of the generated archive by specifying various
-        attribute values, see the attribute and element tables for details.
-
-        Examples:
-
-        <ts.ejbjar descriptor="ejb_sam_Hello_ejb.xml" 
-                   archivename="ejb_sam_Hello"/>
-
-        This example builds an EJB archive named ejb_sam_Hello_ejb.jar.  The deployment
-        descriptor in the EJB archive, ejb-jar.xml, is specified using the descriptor
-        attribute.  Note, the ejb_sam_Hello_ejb.xml file ends up in the EJB archive as
-        the META-INF/ejb-jar.xml with no diffs.  The classes added to the archive are the
-        default classes, TS_HOME/classes/<pkg.dir>/**/*.class.  Where <pkg.dir> is the
-        package name of the test being built.
- 
-
-        <ts.ejbjar descriptor="ejb_sam_Hello_ejb.xml" 
-                   archivename="ejb_sam_Hello"/>
-          <fileset dir="TS_HOME/classes" includes="<some-package>/*.class"/>
-          <fileset dir="TS_HOME/classes" includes="<some-other-package>/*.class"/>
-        </ts.ejbjar>
-
-        This example is the same as the previous example except the user has opted to add
-        additional classes in addition to the default classes.  The additional classes are
-        specified using nested fileset elements.  Note, users may specify additional classes
-        using nested fileset or zipfileset elements.
-
-
-        <ts.ejbjar descriptor="ejb_sam_Hello_ejb.xml" 
-                   archivename="ejb_sam_Hello"/>
-                   includedefaultfiles="false">
-          <fileset dir="TS_HOME/classes" includes="<some-package>/*.class"/>
-          <fileset dir="TS_HOME/classes" includes="<some-other-package>/*.class"/>
-        </ts.ejbjar>
-
-        This example is the same as the previous example except the user has opted
-        to add additional classes instead of the default classes.  The additional classes
-        are specified using nested fileset elements.  Note, users may specify additional
-        classes using nested fileset or zipfileset elements.
-
-
-        <ts.ejbjar descriptor="ejb_sam_Hello_ejb.xml" 
-                   archivename="ejb_sam_Hello"/>
-                   excludedfiles="${pkg.dir}/B*.class">
-        </ts.ejbjar>
-
-        This example excludes all class files that start with "B" that live in the
-        TS_HOME/classes/${pkg.dir}.  If the TS_HOME/classes/${pkg.dir} contained the classes A.class,
-        B1.class, B2.class and C.class only classes A and C would end up in the archive.  Using the
-        excludedfiles attribute is another way of customizing the content of the archive by excluding
-        some of the default content.  Users can also use the includedefaultfiles attribute to exclude
-        all default content but the user must then use nested filesets and or zipfilesets to include
-        the appropriate content.  Using the excludedfiles attribute may be simpler in some cases.
-
-        To continue this example, the following XML does the exact same thing as the example above
-        but it uses the includedefaultfiles attribute and a nested fileset element.
-
-        <ts.ejbjar descriptor="ejb_sam_Hello_ejb.xml" 
-                   archivename="ejb_sam_Hello"/>
-                   includedefaultfiles="false">
-          <fileset dir="TS_HOME/classes" includes="${pkg.dir}/A.class, ${pkg.dir}/C.class"/>
-        </ts.ejbjar>
-
-      -->
-
-        <attribute name="descriptor"
-                   default=""        
-                   description="Deployment descriptor added to the archive if the archive requires a deployment descriptor"/>
-                              
-        <attribute name="manifest"
-                   default=""
-                   description="Manifest to be used within the archive"/>
-        
-        <attribute name="archivename"   
-                   description="Archive name minus the file suffix"/>
-                   
-        <attribute name="descriptordir"
-                   default="${src.dir}/${pkg.dir}"
-                   description="Directory containing the deployment descriptor"/>           
-        
-        <attribute name="includedefaultfiles"
-                   default="true"
-                   description="Include default files in the component archive"/>
-        
-        <attribute name="excludedfiles"
-                   default=""
-                   description="A comma separated list of file expressions to exclude from the set of default included files  This list of file expressions is relative to the TS_HOME/classes directory."/>
-        
-        <element name="jar-elements" implicit="yes" optional="yes"
-                 description="The content to be added to the archive"/>
-        
-        <sequential>
-        
-        <!-- Define commmon preset regardless of includedefaultfiles value-->
-        <presetdef name="component.ejbjar">
-            <_component descriptor="@{descriptor}"
-                       manifest="@{manifest}"
-                       archivename="@{archivename}"
-                       archivesuffix="_ejb.jar"
-                       descriptordir="@{descriptordir}"
-                       internaldescriptorname="META-INF/ejb-jar.xml">
-            </_component>
-        </presetdef>
-        
-        <if>
-          <istrue value="@{includedefaultfiles}"/>
-        <then>
-          <component.ejbjar>
-              <fileset dir="${class.dir}"
-                       includes="${pkg.dir}/**/*.class"
-                       excludes="${pkg.dir}/*lient*.class, @{excludedfiles}"/>
-              <jar-elements/>
-          </component.ejbjar>
-        </then>
-        <else>
-          <component.ejbjar>
-            <jar-elements/>
-          </component.ejbjar>
-        </else>
-        </if>
-        </sequential>
-    </macrodef>
-    
-    
-    <!-- PRESETS -->
-    
-    <!-- TARGETS -->
-            
-</project>
diff --git a/bin/xml/ts.import.xml b/bin/xml/ts.import.xml
deleted file mode 100644
index 7e70a14703..0000000000
--- a/bin/xml/ts.import.xml
+++ /dev/null
@@ -1,792 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
-    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
-
--->
-
-<project name="TestImport" basedir="." default="usage">
-
-    <!-- 
-    This is the main import file for all leaf test directory build.xml files.
-    It contains targets and properties necessary in lower level build files.
-    -->
-    
-    <dirname property="TestImport.basedir" file="${ant.file.TestImport}"/>
-    
-    <!-- IMPORTS -->
-    <import file="./ts.vehicles.xml"/>
-    
-    <!-- PROPERTIES -->
-    
-    <!-- MACROS -->
-    
-    <!-- TARGETS -->
-    <target name="cbr" depends="clean, build, runclient" 
-            description="CTS convenience target for clean, build, runclient"/>
-    
-    <target name="compile" 
-            description="Compiles all java files under a src directory">
-        <ts.javac/>
-    </target>
-
-    <target name="-preclean"
-            description="Initial dependency target for the clean target"/>
-    
-    <target name="clean" depends="-preclean"
-            description="Cleans all classes and archives that were built from a src directory">
-        <ts.clean/>
-    </target>
-    
-    <target name="-precompile"
-            description="Initial dependency target for the compile target"/>
-
-    <target name="-postcompile"
-            description="Post dependency target for the compile target"/>
-
-    <target name="build" depends="-precompile, compile, -postcompile, package"
-            description="Compiles classes and packages archives"/>
-    
-    <target name="build.all"  
-            description="Builds everything for this deliverable">
-        <ant antfile="build.xml" dir="${bin.dir}" target="build.all"/>
-    </target>
-
-    <target name="build.all.jars"  
-            description="Builds tsharness and tck library jars for this deliverable">
-        <ant antfile="build.xml" dir="${bin.dir}" target="build.all.jars"/>
-    </target>
-    
-    <target name="build.all.tests"
-            description="Builds all tests for this deliverable">
-        <ant antfile="build.xml" dir="${bin.dir}" target="build.all.tests"/>
-    </target>
-
-    <target name="clean.classes" 
-            description="Cleans all classes for this pkg.dir">
-        <ts.clean.classes/>    
-    </target>
-    
-    <target name="clean.dist"
-            description="Cleans all archives for this pkg.dir">
-        <ts.clean.dist/>
-    </target>
-    
-    <target name="runclient"
-            depends="-check.for.test.dir.file"
-            description="Executes all tests under a src directory">
-        <ant antfile="build.xml" dir="${bin.dir}" target="runclient"/>
-    </target>
-    
-    <target name="runclient.nobinaryfinder"
-            description="Executes all tests under a src directory">
-        <ant antfile="build.xml" dir="${bin.dir}" target="runclient.nobinaryfinder"/>    
-    </target>
-    
-    <target name="report" 
-            description="Generates a report for all tests under a src directory">
-        <ant antfile="build.xml" dir="${bin.dir}" target="report"/>
-    </target>
-
-    <target name="list.tests"
-            depends="-check.for.test.dir.file"
-            description="Lists all tests under a src directory">
-        <ant antfile="build.xml" dir="${bin.dir}" target="runclient">
-            <property name="exec.mode" value="5"/>
-        </ant>
-    </target>
-
-    <target name="deploy" 
-            description="Deploys all archives under a src directory">
-        <ant antfile="build.xml" dir="${bin.dir}" target="deploy"/>
-    </target>
-    
-    <target name="undeploy" 
-            description="Undeploys all archives under a src directory">
-        <ant antfile="build.xml" dir="${bin.dir}" target="undeploy"/>
-    </target>
-
-    <target name="deploy.all"
-            description="Deploys all currently deployed archives">
-        <ant antfile="build.xml" dir="${bin.dir}" target="deploy.all"/>
-    </target>
-
-    <target name="undeploy.all"
-            description="Undeploys all currently deployed archives">
-        <ant antfile="build.xml" dir="${bin.dir}" target="undeploy.all"/>
-    </target>
-    
-    <target name="run.all"
-            description="Runs all tests">
-        <ant antfile="build.xml" dir="${bin.dir}" target="run.all"/>
-    </target>
-
-    <target name="all" depends="-allcalled, clean, build, deploy, runclient"
-            description="Executes clean, build, deploy, and runclient targets"/>
-    
-    <target name="-allcalled">
-        <property name="all.target.called" value="true"/>    
-    </target>
-    
-    <target name="package">
-        <echo message="No package target implemented for ${pkg.dir}"/>    
-    </target>
-    
-    <target name="-check.for.deliverable.subset">
-        <if>
-        <isset property="${deliverable.dir}.test.dirs" />
-        <then>
-            <propertycopy name="dirs.to.use" from="${deliverable.dir}.test.dirs" />
-            <var name="tests.string" value=""/>
-            <for list="${dirs.to.use}" param="ii" trim="true">
-              <sequential>
-                <var name="tests.string" value="${tests.string} @{ii}"/>
-              </sequential>
-            </for>
-            <echo>Since ${deliverable.dir}.test.dirs is defined, </echo>
-            <echo>the following subset of tests under this directory will be used:</echo>
-            <echo>${tests.string}</echo>
-        </then>
-        </if>
-    </target>
-    
-    <target name="-check.for.test.dir.file">
-        <if>
-        <isset property="tests.file" />
-        <then>
-            <var name="tests.string" value=""/>
-            <loadfile property="tests.from.file" srcFile="${tests.file}"/>
-            <for param="line" list="${tests.from.file}" delimiter="${line.separator}">
-                <sequential>
-                    <var name="tests.string" value="${tests.string} @{line}"/>
-                </sequential>
-            </for>
-            <echo>tests.file set:  ${tests.file}, </echo>
-            <echo>The following subset of tests as listed in the file will be run:</echo>
-            <echo>${tests.from.file}</echo>
-        </then>
-        </if>
-    </target>
-    
-    <!--
-      Using the xmlvalidate task with full xmlcatalog support requires two
-      additional files.  ANT_HOME/lib/resolver.jar is the Apache
-      commons resolver that provides a fully spec compliant XML catalog
-      resolver.  This allows the xmlvalidate task to use an XML catalog that
-      contains rewriteSystem directives.  TS_HOME/lib/catalog is the actual
-      XML catalog file used by the xmlvalidate task.  It contains the mapping
-      of HTTP schema URLs to local file URLs.
-      
-      When using this tool on OWAN you should set a proxy host and port using
-      the ANT_OPTS environment variable.  Here is an example:
-      
-      ANT_OPTS="-Dhttp.proxyHost=www-proxyhost.domain.com -Dhttp.proxyPort=80"
-      
-      Even when using the local XML catalog on OWAN, you should still set the
-      proxy server and port since the resolver will attempt to download any
-      referenced schemas it can not find locally over the network.  This will
-      cause the validate task to run very slowly since it is waiting for the
-      schema requests to timeout.
-    -->
-    <property name="use.xml.catalog" value="true"/>
-    
-    <macrodef name="ts.xmlvalidate">
-      <element name="catalog" optional="true"/>
-      <sequential>
-        <xmlvalidate failonerror="no" lenient="no" warn="yes">
-          <fileset dir="${src.dir}/${pkg.dir}" includes="**/*.xml, **/*.tld"
-                   excludes="**/build.xml"/>
-          <catalog/>
-          <attribute name="http://xml.org/sax/features/validation" value="true"/>
-          <attribute name="http://apache.org/xml/features/validation/schema" value="true"/>
-          <attribute name="http://xml.org/sax/features/namespaces" value="true"/>
-        </xmlvalidate>
-      </sequential>
-    </macrodef>
-    
-    <target name="validate">
-      <if>
-        <istrue value="${use.xml.catalog}"/>
-      <then>
-        <echo>**** Using XML catalog '${ts.home}/lib/catalog' to locate schemas.</echo>
-        <echo>**** To use the schema URLs declared within the XML instances, specify "-Duse.xml.catalog=false" when invoking validate</echo>
-        <loadfile srcFile="${ts.home}/lib/catalog" property="catalog.contents"/>
-        <propertyregex property="mod"
-                       input="${catalog.contents}"
-                       regexp='(rewritePrefix\=\"file\:\/\/)(.*)(\/lib\/.*\/\>)'
-                       replace="\1${ts.home}\3"
-                       defaultvalue="${catalog.contents}"
-                       override="true"
-                       global="true"/>
-        <echo message="${mod}" file="${ts.home}/lib/catalog"/>
-        <echo>Filtered ${ts.home}/lib/catalog</echo>
-        <ts.xmlvalidate>
-          <catalog>
-            <xmlcatalog>
-              <catalogpath>
-                <fileset dir="${ts.home}/lib" includes="catalog"/>
-              </catalogpath>
-            </xmlcatalog>
-          </catalog>        
-        </ts.xmlvalidate>
-      </then>
-      <else>
-        <echo>**** Using schema URLs defined within XML instances.</echo>
-        <ts.xmlvalidate/>
-      </else>
-      </if>
-    </target>
-
-
-	  <macrodef name="long.dir.listing">
-	  	<attribute name="dir"/>
-	  	<sequential>
-	  		<echo>@{dir}</echo>
-<echo>---------------------------------------------------------------</echo>
-	  		<if>
-	        <os family="windows"/>
-	      <then>
-	        <shellscript shell="cmd.exe" tmpsuffix=".bat" dir="@{dir}">
-	          <arg value="/c"/>
-	          dir /P /O-D
-	        </shellscript>
-	        </then>
-	      <elseif>
-	        <os family="unix"/>
-	      <then>
-	      <shellscript shell="bash"
-	        dir="@{dir}"
-	        inputstring="ls -tlF"/>
-	      </then>
-	     	</elseif>
-	     	<else>
-	     		<echo>Error, OS Family not recognized.</echo>
-	     	</else>
-	      </if>
-	    </sequential>
-	  </macrodef>
-	
-	  <target name="llc"
-              description="Displays a long listing of classes in this pkg">
-	    <long.dir.listing dir="${class.dir}/${pkg.dir}"/>
-    </target>
- 
-	  <target name="lld"
-              description="Displays a long listing of archives in this pkg">
-       <long.dir.listing dir="${dist.dir}/${pkg.dir}"/>
-    </target>
- 
-    <target name="lc" 
-            description="Displays the list of classes in this pkg">
-        <if>
-            <available type="dir" file="${class.dir}/${pkg.dir}"/>
-        <then>
-            <echo message="Classes under"/>
-            <echo message="${class.dir}/${pkg.dir}"/>
-            <echo message="--------------------------------------------------"/>
-            <for param="file">
-                <path>
-                    <fileset dir="${class.dir}/${pkg.dir}" includes="*"/>
-                </path>
-                <sequential>
-                    <propertyregex property="file.name.only"
-                                   input="@{file}"
-                                   regexp=".*[\/|\\](.*)"
-                                   select="\1"
-                                   casesensitive="false"
-                                   override="true"/>
-                    <echo message="${file.name.only}"/>
-                </sequential>
-            </for>
-        </then>
-        <else>
-            <echo message="${class.dir}/${pkg.dir} does not exist"/>
-            <echo message="The 'compile' target must be run prior to the 'lc' target"/>
-        </else>
-        </if>         
-    </target>
-    
-    <target name="ld"
-            description="Displays the list of archives in this pkg">
-
-
-        <if>
-            <available type="dir" file="${dist.dir}/${pkg.dir}"/>
-        <then>
-            <echo message="Files under"/>
-            <echo message="${dist.dir}/${pkg.dir}"/>
-            <echo message="--------------------------------------------------"/>
-            <for param="file">
-                <path>
-                    <fileset dir="${dist.dir}/${pkg.dir}" includes="*"/>
-                </path>
-                <sequential>
-                    <propertyregex property="file.name.only"
-                                   input="@{file}"
-                                   regexp=".*[\/|\\](.*)"
-                                   select="\1"
-                                   casesensitive="false"
-                                   override="true"/>
-                    <echo message="${file.name.only}"/>
-                </sequential>
-            </for>
-        </then>
-        <else>
-            <echo message="${dist.dir}/${pkg.dir} does not exist"/>
-            <echo message="The 'build' target must be run prior to the 'ld' target"/>
-        </else>
-        </if>   
-    </target>
-    <target name="pd"
-            description="spawns a window to the associated dist dir for the current src dir">
-        <if>
-            <available type="dir" file="${dist.dir}/${pkg.dir}"/>
-        <then>
-             <if>
-                 <os family="windows"/>
-               <then>
-                 <property name="script" value="${common.bin.dir}/xml/other/windows.bat"/>
-                 <chmod file="${script}" perm="ugo+rwx"/>
-                 <exec executable="${script}" spawn="true">
-                   <arg value="startcmd"/>
-                   <arg value="${dist.dir}/${pkg.dir}"/>
-                 </exec>
-               </then>
-               <elseif>
-                 <os family="unix"/>
-               <then>
-                 <property name="script" value="${common.bin.dir}/xml/other/unix.sh"/>
-                 <chmod file="${script}" perm="ugo+rwx"/>
-                 <exec executable="${script}" spawn="true">
-                   <arg value="startxterm"/>
-                   <arg value="${dist.dir}/${pkg.dir}"/>
-                 </exec>
-               </then>
-               </elseif>
-             </if>
-        </then>
-        <else>
-            <echo message="${dist.dir}/${pkg.dir} does not exist"/>
-            <echo message="The 'build' target must be run prior to the 'pd' target"/>
-        </else>
-        </if>   
-    </target>
-    
-    <target name="pc"
-            description="spawns a window to the associated classes dir for the current src dir">
-        <if>
-            <available type="dir" file="${class.dir}/${pkg.dir}"/>
-        <then>
-             <if>
-                 <os family="windows"/>
-               <then>
-                 <property name="script" value="${common.bin.dir}/xml/other/windows.bat"/>
-                 <chmod file="${script}" perm="ugo+rwx"/>
-                 <exec executable="${script}" spawn="true">
-                   <arg value="startcmd"/>
-                   <arg value="${class.dir}/${pkg.dir}"/>
-                 </exec>
-               </then>
-               <elseif>
-                 <os family="unix"/>
-               <then>
-                 <property name="script" value="${common.bin.dir}/xml/other/unix.sh"/>
-                 <chmod file="${script}" perm="ugo+rwx"/>
-                 <exec executable="${script}" spawn="true">
-                   <arg value="startxterm"/>
-                   <arg value="${class.dir}/${pkg.dir}"/>
-                 </exec>
-               </then>
-               </elseif>
-             </if>
-        </then>
-        <else>
-            <echo message="${class.dir}/${pkg.dir} does not exist"/>
-            <echo message="The 'build' target must be run prior to the 'pc' target"/>
-        </else>
-        </if>   
-    </target>
-    
-    <target name="verify" description="Runs Java EE Verification on the archives under this directory">
-        <echo message="Running verify from ts.common.xml"/>
-        <verifier resultsdir="${verifierresultsdir}"
-        archivedir="${verifierarchivedir}"
-        defaultincludes="${verifierdefaultincludes}"
-        failonerror="${verifierfailonerror}"
-        saveresults="${verifiersaveresults}"/>
-    </target>
-	
-    <target name="pmd" description="Runs the PMD tool on the src directory">
-        <if>
-          <isfalse value="${in.workspace}"/>
-        <then>
-            <echo message="This target is only valid within a workspace since PMD is not included in a bundle."/>
-        </then>
-        <else>
-            <ts.pmd/>
-        </else>
-        </if>    
-    </target>
-
-    <target name="findbugs" description="Runs the Findbugs tool on the classes under this directory">
-        <if>
-          <isfalse value="${in.workspace}"/>
-        <then>
-            <echo message="This target is only valid within a workspace since Findbugs is not included in a bundle."/>
-        </then>
-        <else>
-            <if>
-              <not> <available file="${class.dir}/${pkg.dir}" type="dir"/> </not>
-            <then>
-               <antcall target="build" />
-            </then>
-            </if>
-            <ts.findbugs/>
-        </else>
-        </if>    
-    </target>
-    
-    <target name="findbugsxml" description="Runs the Findbugs tool (with XML output) on the classes under this directory">
-        <if>
-          <isfalse value="${in.workspace}"/>
-        <then>
-            <echo message="This target is only valid within a workspace since Findbugs is not included in a bundle."/>
-        </then>
-        <else>
-            <if>
-              <not> <available file="${class.dir}/${pkg.dir}" type="dir"/> </not>
-            <then>
-               <antcall target="build" />
-            </then>
-            </if>
-            <ts.findbugs.xml/>
-        </else>
-        </if>
-    </target>
-
-    <target name="findbugshtml" description="Runs the Findbugs tool (with html output) on the classes under this directory">
-        <if>
-          <isfalse value="${in.workspace}"/>
-        <then>
-            <echo message="This target is only valid within a workspace since Findbugs is not included in a bundle."/>
-        </then>
-        <else>
-            <if>
-              <not> <available file="${class.dir}/${pkg.dir}" type="dir"/> </not>
-            <then>
-               <antcall target="build" />
-            </then>
-            </if>
-            <ts.findbugs.html/>
-        </else>
-        </if>
-    </target>
-
-    <target name="listimport" 
-            description="Lists the ant import path for a given src directory">
-        <ts.buildfile/>
-    </target>
-    
-    <target name="listarchivecontents"
-            description="Displays the contents of archives in this pkg">
-        <!-- 
-          The listarchivecontents target prints out the contents of all 
-          archives under ${dist.dir}/${pkg.dir}.  This is very useful when
-          working within Netbeans.
-        -->
-        
-        <if>
-            <available type="dir" file="${dist.dir}/${pkg.dir}"/>
-        <then>
-            <for param="file">
-                <path>
-                    <fileset dir="${dist.dir}/${pkg.dir}" 
-                             includes="*.ear, *.jar, *.rar, *.war, *.car"/>
-                </path>
-                <sequential>
-                    <trycatch>
-                    <try>
-                        <propertyregex property="archive.name.only"
-                          input="@{file}"
-                          regexp=".*[\/|\\](.*)"
-                          select="\1"
-                          casesensitive="false"
-                          override="true"/>
-
-                        <propertyregex property="relative.archive.name"
-                          input="@{file}"
-                          regexp=".*[\/|\\]dist[\/|\\](.*)"
-                          select="\1"
-                          casesensitive="false"
-                          override="true"/>
-
-                        <mkdir dir="${dist.dir}/${pkg.dir}/${archive.name.only}.dir"/>
-                        <unjar src="@{file}" dest="${dist.dir}/${pkg.dir}/${archive.name.only}.dir"/>
-                        <echo message="Contents of ${archive.name.only}"/>
-                        <echo message="---------------------------------------------"/>
-                        <for param="file2">
-                            <path>
-                                <fileset dir="${dist.dir}/${pkg.dir}/${archive.name.only}.dir" includes="**"/>
-                            </path>
-                            <sequential>
-                            <propertyregex property="relative.archive.name2"
-                                           input="@{file2}"
-                                           regexp=".*[\/|\\]${archive.name.only}.dir[\/|\\](.*)"
-                                           select="\1"
-                                           casesensitive="false"
-                                           override="true"/>
-                            <echo message="${relative.archive.name2}"/>
-                            </sequential>
-                        </for>
-                    </try>
-                    <finally>
-                        <echo message="---------------------------------------------"/>
-                        <delete includeEmptyDirs="true">
-                              <fileset dir="${dist.dir}/${pkg.dir}/${archive.name.only}.dir"/>
-                        </delete>
-                    </finally>
-              </trycatch>
-
-                </sequential>
-            </for>
-        </then>
-        <else>
-            <echo message="${dist.dir}/${pkg.dir} does not exist"/>
-            <echo message="The 'build' target must be run prior to the 'listarchivecontents' target"/>
-        </else>
-        </if>
-    </target>
-    
-  <!-- Temporary target which compares built archives with those from an
-       existing CTS bundle.  The only requirement is to set old.dist.dir
-       to point to a CTS 5 patch bundle's dist dir.  You also must be sure
-       that the "_delete.component.archives" macro is disabled in ts.ear.xml.
-  -->
-    <target name="check"
-            description="Compares archive contents with another build">
-        
-        <for param="earfile">
-            <path>
-                <fileset dir="${old.dist.dir}/${pkg.dir}" 
-                         includes="*.ear"/>
-            </path>
-            
-        <sequential>
-            <unjar src="@{earfile}" dest="${old.dist.dir}/${pkg.dir}"/>
-        </sequential>
-        </for>
-        
-        <for param="file">
-            <path>
-                <fileset dir="${dist.dir}/${pkg.dir}" 
-                         includes="*.ear, *.jar, *.rar, *.war, *.car"/>
-            </path>
-            <sequential>
-            
-            <var name="found.match" value="false"/>
-            <var name="extra.files" value=""/>
-            <var name="missing.files" value=""/>
-        
-            <propertyregex property="archive.name.only"
-              input="@{file}"
-              regexp=".*[\/|\\](.*)"
-              select="\1"
-              casesensitive="false"
-              override="true"/>
-              
-            <propertyregex property="relative.archive.name"
-              input="@{file}"
-              regexp=".*[\/|\\]dist[\/|\\](.*)"
-              select="\1"
-              casesensitive="false"
-              override="true"/>
-              
-            <mkdir dir="${dist.dir}/${pkg.dir}/${archive.name.only}.dir"/>
-            <unjar src="@{file}" dest="${dist.dir}/${pkg.dir}/${archive.name.only}.dir"/>
-            
-            <mkdir dir="${old.dist.dir}/${pkg.dir}/${archive.name.only}.dir"/>
-            <unjar src="${old.dist.dir}/${pkg.dir}/${archive.name.only}" dest="${old.dist.dir}/${pkg.dir}/${archive.name.only}.dir"/>
-                            
-            <for param="newfile">
-                <path>
-                    <fileset dir="${dist.dir}/${pkg.dir}/${archive.name.only}.dir" includes="**"/>
-                </path>
-                <sequential>
-                <propertyregex property="relative.archive.name2"
-                               input="@{newfile}"
-                               regexp=".*[\/|\\]${archive.name.only}.dir[\/|\\](.*)"
-                               select="\1"
-                               casesensitive="false"
-                               override="true"/>
-                
-                                <!--check against old files-->
-                            <if>
-                                <not>
-                                    <available file="${old.dist.dir}/${pkg.dir}/${archive.name.only}.dir/${relative.archive.name2}"/>                            
-                                </not>
-                            <then>
-                                <var name="extra.files" value="${extra.files}, ${relative.archive.name2}"/>
-                            </then>
-                            </if>  
-                </sequential>
-            </for>
-            
-            <echo message="EXTRA FILES IN NEW:  ${archive.name.only}"/>
-            <echo message="-----------------------------------------------------"/>
-            
-            <if>
-                <equals arg1="${extra.files}" arg2=""/>                            
-            <then>
-                <echo message="None"/>
-            </then>
-            <else>
-                <property name="extra.file.errors.exist" value="true"/>
-                <for list="${extra.files}" param="extra">
-                <sequential>
-                    <echo>@{extra}</echo>
-                </sequential>
-                </for>
-            </else>
-            </if> 
-            
-            <for param="oldfile">
-                <path>
-                    <fileset dir="${old.dist.dir}/${pkg.dir}/${archive.name.only}.dir" includes="**"/>
-                </path>
-                <sequential>
-                <propertyregex property="old.relative.archive.name2"
-                               input="@{oldfile}"
-                               regexp=".*[\/|\\]${archive.name.only}.dir[\/|\\](.*)"
-                               select="\1"
-                               casesensitive="false"
-                               override="true"/>
-                
-                                <!--check against new files-->
-                                
-
-                            <if>
-                                <not>
-                                    <available file="${dist.dir}/${pkg.dir}/${archive.name.only}.dir/${old.relative.archive.name2}"/>
-                                </not>                            
-                            <then>
-                                <var name="missing.files" value="${missing.files}, ${old.relative.archive.name2}"/>
-                            </then>
-                            </if>
-                            
-                </sequential>
-            </for>
-            
-            <echo message=""/>
-            
-            <echo message="-----------------------------------------------------"/>
-            <echo message="MISSING FILES IN NEW:  ${archive.name.only}"/>
-            <echo message="-----------------------------------------------------"/>
-            
-            <if>
-                <equals arg1="${missing.files}" arg2=""/>                            
-            <then>
-                <echo message="None"/>
-            </then>
-            <else>
-                <property name="missing.file.errors.exist" value="true"/>
-                <for list="${missing.files}" param="missing">
-                <sequential>
-                    <echo>@{missing}</echo>
-                </sequential>
-                </for>
-            </else>
-            </if>
-
-            <echo message="---------------------------------------------"/>
-            <echo message="------- DIFFS (*.xml and MANIFEST) ----------"/>
-
-            <for param="newfile2">
-                <path>
-                    <fileset dir="${dist.dir}/${pkg.dir}/${archive.name.only}.dir"
-                             includes="**/*.xml, **/MANIFEST.MF"/>
-                </path>
-                <sequential>
-                  <propertyregex property="relative.newfile2"
-                               input="@{newfile2}"
-                               regexp=".*[\/|\\]${archive.name.only}.dir[\/|\\](.*)"
-                               select="\1"
-                               casesensitive="false"
-                               override="true"/>
-                  <var name="old.file"
-                       value="${old.dist.dir}/${pkg.dir}/${archive.name.only}.dir/${relative.newfile2}"/>
-                  <if>
-                    <available file="${old.file}"/>
-                  <then>
-                    <if>
-                      <contains string="${relative.newfile2}" substring=".xml"/>
-                    <then>
-                      <echo>${line.separator}Pretty printing: ${old.file}</echo>
-                      <ant dir="${env.TOOLS_HOME}/tools/pretty-xml" target="run">
-                        <property name="input.file"  value="${old.file}"/>
-                        <property name="output.file" value="${old.file}"/>
-                      </ant>
-                      <echo>${line.separator}Pretty printing: @{newfile2}</echo>
-                      <ant dir="${env.TOOLS_HOME}/tools/pretty-xml" target="run">
-                        <property name="input.file"  value="@{newfile2}"/>
-                        <property name="output.file" value="@{newfile2}"/>
-                      </ant>
-                    </then>
-                    </if>
-                    <echo>${line.separator}DIFFING:</echo>
-                    <echo>   @{newfile2}</echo>
-                    <echo>   ${old.file}</echo>
-                    <exec executable="diff">
-                      <arg line="@{newfile2} ${old.file}"/>
-                    </exec>
-                  </then>
-                  </if>
-                </sequential>
-            </for>
-
-            <echo message="---------------------------------------------"/>
-            <delete includeEmptyDirs="true">
-                <fileset dir="${dist.dir}/${pkg.dir}/${archive.name.only}.dir"/>
-                <fileset dir="${old.dist.dir}/${pkg.dir}/${archive.name.only}.dir"/>
-            </delete>
-            </sequential>
-        </for>
-        
-        <echo message="---------------------------------------------"/>
-        <echo message="EXTRA/MISSING FILE SUMMARY"/>
-        <echo message="---------------------------------------------"/>
-        <if>
-            <isset property="extra.file.errors.exist"/>                            
-        <then>
-            <echo message="Extra:    Errors exist"/>
-        </then>
-        <else>
-            <echo message="Extra:    No errors"/>
-        </else>
-        </if>
-        
-        <if>
-            <isset property="missing.file.errors.exist"/>                            
-        <then>
-            <echo message="Missing:  Errors exist"/>
-        </then>
-        <else>
-            <echo message="Missing:  No errors"/>
-        </else>
-        </if>
-            
-        
-    </target>
-
-</project>
diff --git a/bin/xml/ts.nonleafimport.xml b/bin/xml/ts.nonleafimport.xml
deleted file mode 100644
index 81d470614c..0000000000
--- a/bin/xml/ts.nonleafimport.xml
+++ /dev/null
@@ -1,314 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
-    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
-
--->
-
-<project name="NonLeafImport" basedir="." default="usage">
-
-    <!-- 
-    This is the main import file for all nonleaf test directory nbuild.xml 
-    files.  It contains targets and properties necessary to build everything
-    under a nonleaf level directory (accoring to the leaf level build file
-    definitions.
-    -->
-    
-    <!-- IMPORTS -->
-    <import file="./ts.import.xml"/>
-    
-    <!-- PROPERTIES -->
-    
-    <!-- TARGETS -->
-    <target name="build" description="Compiles classes and packages archives"
-            unless="called.by.dosubdirs">
-            <ts.javac includes="*.java"/>
-            <dosubdirs srcdir="${basedir}" todo="build"/>
-    </target>
-    
-    <target name="package" unless="called.by.dosubdirs">
-        <dosubdirs srcdir="${basedir}" todo="package"/>    
-    </target>
-    
-    <target name="compile" unless="called.by.dosubdirs">
-        <ts.javac includes="*.java"/>
-        <dosubdirs srcdir="${basedir}" todo="compile"/>    
-    </target>
-  
-    <target name="lc" unless="called.by.dosubdirs" 
-            description="Displays the list of classes in this pkg">
-        <dosubdirs srcdir="${basedir}" todo="lc"/>    
-    </target>
-    
-    <target name="ld" unless="called.by.dosubdirs"
-            description="Displays the list of archives in this pkg">
-        <dosubdirs srcdir="${basedir}" todo="ld"/>  
-    </target>
-    
-    <target name="runclient"
-            depends="-check.for.deliverable.subset, -check.for.test.dir.file"
-            description="Executes all tests under a src directory">
-        <antcall target="TestImport.runclient"/>
-    </target>
-
-    <target name="runclient.nobinaryfinder"
-            depends="-check.for.deliverable.subset, -check.for.test.dir.file"
-            description="Executes all tests under a src directory">
-        <antcall target="TestImport.runclient.nobinaryfinder"/>    
-    </target>
-    
-    <target name="list.tests"
-            depends="-check.for.deliverable.subset, -check.for.test.dir.file"
-            description="Lists all tests under a src directory">
-        <antcall target="TestImport.list.tests"/>
-    </target>
-
-    <target name="listarchivecontents" unless="called.by.dosubdirs"
-            description="Displays the contents of archives in this pkg">
-        <!-- 
-          The listarchivecontents target prints out the contents of all 
-          archives under ${dist.dir}/${pkg.dir}.  This is very useful when
-          working within Netbeans.
-        -->
-       <dosubdirs srcdir="${basedir}" todo="listarchivecontents"/>
-    </target>
-    
-    <target name="createnonleafbuildfiles" 
-            description="Generates non leaf level build files where needed">
-        <!-- 
-        Run this target from an existing non leaf src directory.  It will check
-        each non leaf level dir below it and, if no build.xml file exists,
-        a nonleaf build.xml file will be created.  It will create the build.xml
-        file with a project name attribute equal to the directory relative to
-        com/sun/ts/tests (with underscores replacing the dir path separator).
-        -->   
-        <ts.nonleafbuildfile/>
-    </target>
-    
-    <target name="-sweepbuildfiles" 
-            description="sweeps build files">
-        
-
-                <replace dir="${ts.home}/install"
-                             includes="**/*.xml">
-                        <replacetoken><![CDATA[${ts.home}/bin]]></replacetoken>
-                        <replacevalue><![CDATA[${bin.dir}]]></replacevalue>
-                    </replace>
-                    
-                
-    </target>
-    
-    <!-- MACROS -->
-    
-    <macrodef name="ts.nonleafbuildfile">
-        
-        <!-- 
-        This macro will check each non leaf level dir below it and, if no 
-        build.xml file exists, a nonleaf build.xml file will be created.  
-        It will create the build.xml file with a project name attribute equal 
-        to the directory relative to com/sun/ts/tests (with underscores 
-        replacing the dir path separator).
-        -->
-      
-        <sequential>
-        <var name="counter" value="0"/>
-          
-        <for param="dir">
-            <path>
-                <dirset dir="${basedir}"/>
-            </path>
-            <sequential>
- 
-            <if>
-                <not>    
-                    <or>
-                        <available file="@{dir}/build.xml"/>
-                        <available file="@{dir}/common.xml"/>
-                        <contains string="@{dir}" substring="META-INF"/>
-                        <contains string="@{dir}" substring="WEB-INF"/>
-                        <contains string="@{dir}" substring="webFiles"/>
-                        <contains string="@{dir}" substring="contentRoot"/>
-                        <contains string="@{dir}" substring="ts/tests/common"/>
-                    </or>
-                </not>  
-            <then>
-                <var name="skip.build.file.creation" value="false"/>
-                <for param="dircontent">
-                  <path>
-                    <fileset dir="@{dir}" includes="*"
-                             excludes="README"/>
-                  </path>
-                  <sequential>
-                    <if>
-                        <isfileselected file="@{dircontent}">
-                          <type type="file"/>
-                        </isfileselected>                  
-                   <then>
-                       <var name="skip.build.file.creation" value="true"/>
-                   </then>
-                   </if>
-                  </sequential>
-                </for>    
-
-                <if>
-                    <equals arg1="${skip.build.file.creation}" arg2="false"/>
-                <then>
-                    <propertyregex property="relative.archive.dir"
-                                       input="@{dir}"
-                                       regexp=".*[\/|\\]src[\/|\\]com[\/|\\]sun[\/|\\]ts[\/|\\]tests[\/|\\](.*)"
-                                       select="\1"
-                                       casesensitive="false"
-                                       override="true"/>
-
-                    <if>
-                        <contains string="${relative.archive.dir}" substring="${file.separator}"/>
-                    <then>
-                        <propertyregex property="relative.archive.dir.underscores" input="${relative.archive.dir}" 
-                             regexp="[\/|\\]" replace="_"
-                             casesensitive="false" override="true"/>
-                    </then>
-                    <else>
-                        <var name="relative.archive.dir.underscores" value="${relative.archive.dir}"/>
-                    </else>
-                    </if>
-                
-                    <propertyregex property="relative.archive.name"
-                           input="@{dir}"
-                           regexp=".*[\/|\\]src[\/|\\](.*)"
-                           select="\1"
-                           casesensitive="false"
-                           override="true"/>
-
-                    <var name="newval" value="../"/>
-
-                    <for list="${relative.archive.name}" 
-                         delimiter="${file.separator}"
-                         param="word">
-                    <sequential>
-                        <var name="newval" value="../${newval}"/>    
-                    </sequential>
-                    </for>
-
-                    <!--file="@{dir}/build.xml"-->
-                    <echoxml file="@{dir}/build.xml">
-                        <project name="${relative.archive.dir.underscores}" basedir="." 
-                                 default="usage"> 
-                            <!-- IMPORTS -->
-                            <import file="${newval}bin/xml/ts.nonleafimport.xml"/>   
-                        </project>
-                    </echoxml>
-                    
-                    <math result="counter" operand1="${counter}" 
-                              operation="+" operand2="1" datatype="int"/>
-                              
-                    <echo message="CREATED   - dir = @{dir}/build.xml"/>
-                    
-                    <echo message="-----------------------------------------------"/>
-               </then>
-               <else>
-                    <echo message="SKIPPED   - dir = @{dir}"/>
-                </else>
-                </if>
-            </then>
-            <else>
-                <echo message="SKIPPED   - dir = @{dir}"/>
-            </else>
-            </if>  
-            </sequential>
-        </for>
-        <echo message="-----------------------------------------------"/>
-        <echo message="${counter} non-leaf level build.xml file(s) created"/>
-        </sequential>  
-    </macrodef>
-    
-    <macrodef name="ts.replaceinbuildxml">
-        
-        <!-- 
-        This macro, when run from a target from an existing non leaf src 
-        directory will check each build.xml file below it for the string 
-        specified by the filecontains attribute.  By default, all non leaf 
-        build.xml files are used and the string, "src_nonleaf" is replaced
-        by a string equal to the directory relative to com/sun/ts/tests 
-        (with underscores replacing the dir path separator).
-        
-        NOTE - This macro was originally used to replace the project name,
-        "src_nonleaf" in all non leaf build.xml files.  I'm leaving it around
-        in case we have anohter need for it.
-        -->
-        
-        <attribute name="filecontains"
-                   default="nonleafimport.xml"
-                   description="Search for files containg this string."/>
-                 
-        <attribute name="tokentoreplace"
-                   default="src_nonleaf"
-                   description="The token to replace"/>
-        
-        <sequential>
-        <var name="counter" value="0"/>
-          
-        <for param="file">
-            <path>
-                <fileset dir="${basedir}" includes="**/build.xml"/>
-            </path>
-            <sequential>
-            
-            <if>
-                <isfileselected file="@{file}">
-                    <contains text="@{filecontains}"/>
-                </isfileselected>
-            <then>
-                <propertyregex property="relative.archive.dir"
-                                       input="@{file}"
-                                       regexp=".*[\/|\\]src[\/|\\]com[\/|\\]sun[\/|\\]ts[\/|\\]tests[\/|\\](.*)"
-                                       select="\1"
-                                       casesensitive="false"
-                                       override="true"/>
-
-                <propertyregex property="relative.archive.dir.withoutfile" input="${relative.archive.dir}" 
-                         regexp="[\/|\\]build\.xml" replace=""
-                         casesensitive="false" override="true"/>
-
-                <if>
-                    <contains string="${relative.archive.dir.withoutfile}" substring="${file.separator}"/>
-                <then>
-                    <propertyregex property="relative.archive.dir.underscores" input="${relative.archive.dir.withoutfile}" 
-                         regexp="[\/|\\]" replace="_"
-                         casesensitive="false" override="true"/>
-                </then>
-                <else>
-                    <var name="relative.archive.dir.underscores" value="${relative.archive.dir.withoutfile}"/>
-                </else>
-                </if>
-
-                <replace file="@{file}" token="src_nonleaf" value="${relative.archive.dir.underscores}"/>
-                <echo message="MODIFIED           = @{file}"/>
-                <echo message="NEW PROJECT STRING = ${relative.archive.dir.underscores}"/>
-                <echo message="-----------------------------------------------"/>
-                <math result="counter" operand1="${counter}" 
-                      operation="+" operand2="1" datatype="int"/>
-            </then>
-            <else>
-                <echo message="SKIPPED            = @{file}"/>
-                <echo message="-----------------------------------------------"/>    
-            </else>
-            </if>
-        </sequential>
-        </for>
-            <echo message="-----------------------------------------------"/>
-            <echo message="Total files updated:  ${counter}"/>         
-        </sequential>  
-    </macrodef>
-</project>
diff --git a/bin/xml/ts.par.xml b/bin/xml/ts.par.xml
deleted file mode 100644
index 155f7ee84d..0000000000
--- a/bin/xml/ts.par.xml
+++ /dev/null
@@ -1,313 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
-    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
-
--->
-
-<project name="ParImport" basedir="." default="usage">
-
-    <!-- IMPORTS -->
-    <import file="./ts.common.xml"/>
-
-    <!-- LOCAL PROPERTY DEFINITIONS -->
-
-    <!-- MACROS -->
-    <macrodef name="ts.par">
-
-        <!--
-          The ts.par task allows users to build persistence archives.  By default all
-          classes under TS_HOME/classes/<pkg.dir> are included in the generated archive.
-          Users may specify additional content using nested fileset and zipfileset elements.
-          User may also tweak the contents of the generated archive by specifying various
-          attribute values, see the attribute and element tables for details.
-  
-          Examples:
-
-        This is the most common example used and includes all classes that are included in the
-        fileset.
-
-         <ts.par descriptor="persistence.xml"
-                descriptordir="${ts.home}/src/com/sun/ts/tests/jpa/common/template/standalone"
-        	archivename="jpa_core_entitytest_apitests">
-      		<fileset dir="${class.dir}"
-               		includes="${par.classes}"/>
-        </ts.par>
-
-        This example includes the contents of the two filesets and the zipfileset.
-
-        IMPORTANT:
-        The names of the mapping files must contain "mappingfile" (any case) and must end with ".xml"
-        It must also be placed at the root of the archive
-
-        <ts.par descriptor="persistence.xml"
-                descriptordir="${ts.home}/src/com/sun/ts/tests/jpa/common/template/standalone"
-                archivename="jpa_core_entitytest_apitests">
-            <fileset dir="${class.dir}"
-                     includes="${par.classes}"/>
-            <fileset dir="." includes="${par.mappingfiles}"/>
-            <zipfileset dir="." includes="orm.xml" prefix="META-INF"/>
-        </ts.par>
-
-        -->
-
-        <attribute name="descriptor"
-                   default=""
-                   description="Deployment descriptor added to the archive if the archive requires a deployment descriptor"/>
-
-        <attribute name="manifest"
-                   default=""
-                   description="Manifest to be used within the archive"/>
-
-        <attribute name="archivename"
-                   description="Archive name minus the file suffix"/>
-
-        <attribute name="descriptordir"
-                   default="${src.dir}/${pkg.dir}"
-                   description="Directory containing the deployment descriptor"/>
-
-        <element name="jar-elements" implicit="yes" optional="true"
-                 description="The content to be added to the archive"/>
-
-        <attribute name="shouldmodifydescriptor"
-                   default="true"
-                   description="Modify the descriptor file and add classes and mappingfiles"/>
-        <sequential>
-            <!-- steps for persistence tests-->
-            <if>
-                <contains string="${pkg.dir}" substring="jpa"/>
-                <then>
-                    <echo message="In Persistence tests directory"/>
-                    <if>
-                        <contains string="${pkg.dir}" substring="pluggability"/>
-                        <then>
-                            <echo message="It is a pluggability test"/>
-                            <property name="effective.descriptordir" value="@{descriptordir}"/>
-                            <property name="effective.descriptor" value="@{descriptor}"/>
-                        </then>
-                        <else>
-                            <if>
-                                <istrue value="@{shouldmodifydescriptor}"/>
-                            <then>
-
-                            <echo message="It is not a pluggability test"/>
-                            <modify-persistence-xml original.persistence.xml.file="@{descriptordir}/@{descriptor}"
-                                                    archivename="@{archivename}">
-                                <jar-elements/>
-                            </modify-persistence-xml>
-
-                            <dirname property="effective.descriptordir" file="${modified.persistence.xml.file}"/>
-                            <basename property="effective.descriptor" file="${modified.persistence.xml.file}"/>
-                            </then>
-                            <else>
-                                <property name="effective.descriptordir" value="@{descriptordir}"/>
-                                <property name="effective.descriptor" value="@{descriptor}"/>
-                            </else>
-                            </if>
-
-                        </else>
-                    </if>
-                </then>
-                <else>
-                    <echo message="WARNING: Using &lt;ts.par&gt; when not in the JPA directory"/>
-                    <property name="effective.descriptordir" value="@{descriptordir}"/>
-                    <property name="effective.descriptor" value="@{descriptor}"/>
-                </else>
-            </if>
-            <!-- end of steps for Persistence tests -->
-
-            <!-- Define commmon preset regardless of includedefaultfiles value-->
-            <presetdef name="component.par">
-                <_component descriptor="${effective.descriptor}"
-                            manifest="@{manifest}"
-                            archivename="@{archivename}"
-                            archivesuffix=".jar"
-                            descriptordir="${effective.descriptordir}"
-                            internaldescriptorname="META-INF/persistence.xml">
-                </_component>
-            </presetdef>
-
-            <!-- include all the contents of filesets and zipfilesets passed in -->
-            <component.par>
-                <jar-elements/>
-            </component.par>
-
-            <!-- steps for standalone TCK only -->
-            <if>
-                <equals arg1="${platform.mode}" arg2="standalone"/>
-                <then>
-                    <ts.verbose message="In standalone TCK mode, delete entity classes specified in par"/>
-                    <for param="entry" trim="true">
-                        <jar-elements/>
-                        <sequential>
-                            <if>
-                                <contains string="@{entry}" substring=".class"/>
-                                <then>
-                                    <delete failonerror="true" file="@{entry}"/>
-                                </then>
-                            </if>
-                        </sequential>
-                    </for>
-                </then>
-            </if>
-            <!-- end of steps for standalone TCK only -->
-
-        </sequential>
-    </macrodef>
-
-    <!-- PRESETS -->
-
-    <!-- TARGETS -->
-    <!-- The following targets and properties are currently used only when building
-         the standalone TCK -->
-
-    <property name="modified.persistence.xml.file" value="/tmp/modified.persistence.xml"/>
-
-
-    <macrodef name="modify-persistence-xml">
-        <attribute name="original.persistence.xml.file"
-                   description="Archive name minus the file suffix"/>
-        <attribute name="archivename"
-                   description="Archive name minus the file suffix"/>
-        <element name="jar-elements" implicit="yes" optional="true"
-                 description="Modify the persistence.xml file to add class tags for all classes"/>
-        <sequential>
-            <echo message="pkg.dir = ${pkg.dir}"/>
-            <echo message="original.persistence.xml.file=@{original.persistence.xml.file}"/>
-            <echo message="archivename=@{archivename}"/>
-
-            <!-- remove any previous xml file -->
-            <delete file="${modified.persistence.xml.file}" quiet="true"/>
-
-            <!-- create the tags of all the entity classes to be added to the persistence.xml file -->
-            <var name="persistence.xml.class.elements" value="&lt;classes&gt;"/>
-            <!-- since a mapping file might not be present set this to empty for now -->
-            <var name="persistence.xml.mappingfile.elements" value=""/>
-
-            <for param="entry" trim="true">
-                <jar-elements/>
-                <sequential>
-                    <ts.verbose message="Processing entry: @{entry}"/>
-
-                    <if>
-                        <contains string="@{entry}" substring=".class"/>
-                        <then>
-                            <ts.verbose message="class file found"/>
-                            <var name="stripoffclassestext" unset="true"/>
-                            <var name="par.class.no.dot.class" unset="true"/>
-                            <var name="par.class.canonical" unset="true"/>
-
-                            <propertyregex property="remove.up.to.classes" input="@{entry}"
-                                           regexp="^.*classes[\/|\\]" replace=""
-                                           casesensitive="true" override="true" />
-                            <ts.verbose message="remove.up.to.classes:${remove.up.to.classes}"/>
-
-                            <propertyregex property="par.class.no.dot.class" input="${remove.up.to.classes}"
-                                           regexp="\.class" replace=""
-                                           casesensitive="true" override="true"/>
-                            <ts.verbose message="par.class.no.dot.class:${par.class.no.dot.class}"/>
-
-                            <propertyregex property="par.class.canonical" input="${par.class.no.dot.class}"
-                                           regexp="[\/|\\]" replace="\."
-                                           casesensitive="true" override="true"/>
-                            <ts.verbose message="par.class.canonical:${par.class.canonical}"/>
-
-                            <var name="persistence.xml.class.elements"
-                                 value="${persistence.xml.class.elements}&lt;class&gt;${par.class.canonical}&lt;/class&gt;"/>
-                        </then>
-                        <elseif>
-                            <and>
-                                <contains string="@{entry}" substring=".xml"/>
-                                <contains string="@{entry}" substring="MappingFile" casesensitive="false"/>
-                            </and>
-                            <then>
-                                <ts.verbose message="mapping file found"/>
-
-                                <!-- process a mapping file -->
-                                <if>
-                                    <not>
-                                        <isset property="found.mapping.file"/>
-                                    </not>
-                                    <then>
-                                        <!-- set this to true so we know we found a mapping file and only
-                                             add the <mapping-files> tag to the elements variable once. -->
-                                        <var name="found.mapping.file" value="true"/>
-                                        <var name="persistence.xml.mappingfile.elements"
-                                             value="${persistence.xml.mappingfile.elements}&lt;mapping-files&gt;"/>
-                                    </then>
-                                </if>
-                                <!-- remove everything up to the name of the file myMappingFile.xml -->
-                                <propertyregex property="get.just.mapping.filename" input="@{entry}"
-                                               regexp="^.*\/([^\.]*\.xml)" replace="\1"
-                                               casesensitive="true" override="true"/>
-                                <ts.verbose message="mappingfile name:${get.just.mapping.filename}"/>
-                                <var name="persistence.xml.mappingfile.elements"
-                                     value="${persistence.xml.mappingfile.elements}&lt;mapping-file&gt;${get.just.mapping.filename}&lt;/mapping-file&gt;"/>
-                            </then>
-                        </elseif>
-                        <else>
-                            <echo message="Entry: @{entry} WAS NOT PROCESSED"/>
-                        </else>
-                    </if>
-                </sequential>
-            </for>
-
-            <!-- terminate the xml fragments for the entity classes that will be added to the persistence.xml file.
-                 since there will always be at least one class present just do this here instead of below. -->
-            <var name="persistence.xml.class.elements" value="${persistence.xml.class.elements}&lt;/classes&gt;"/>
-
-            <echo message="original persistence xml file=@{original.persistence.xml.file}"/>
-            <echo message="modified persistence xml file=${modified.persistence.xml.file}"/>
-            <var name="infile" value="@{original.persistence.xml.file}" />
-
-
-           <!-- if a mapping file was found -->
-            <if>
-                <isset property="found.mapping.file"/>
-                <then>
-                    <!-- terminate the xml fragments for the mapping files that will be added to the persistence.xml file -->
-                    <var name="persistence.xml.mappingfile.elements"
-                         value="${persistence.xml.mappingfile.elements}&lt;/mapping-files&gt;"/>
-
-                    <echo message="About to modify: ${modified.persistence.xml.file} with mapping entries"/>
-                    <echo message="mappingfile fragments=${persistence.xml.mappingfile.elements}"/>
-                    <echo message="infile:${infile}"/>
-
-                    <modifyxml infile="${infile}"
-                               outfile="${modified.persistence.xml.file}"
-                               defaultnsprefix="ee-persitence"
-                               xpathexpr="//ee-persitence:persistence-unit">
-                        <xmlfragment ignoreroot="true" xmlfragmentattribute="${persistence.xml.mappingfile.elements}"/>
-                    </modifyxml>
-                    <!-- set the infile which will be modified with classes to the modified file -->
-                    <var name="infile" value="${modified.persistence.xml.file}" />
-                </then>
-            </if>
-
-            <!-- modify xml file with classes -->
-            <echo message="About to modify: ${infile} with class entries"/>
-            <echo message="classes fragments:${persistence.xml.class.elements}"/>
-
-            <echo message="infile:${infile}"/>
-            <modifyxml infile="${infile}"
-                       outfile="${modified.persistence.xml.file}"
-                       defaultnsprefix="ee-persitence"
-                       xpathexpr="//ee-persitence:persistence-unit">
-                <xmlfragment ignoreroot="true" xmlfragmentattribute="${persistence.xml.class.elements}"/>
-            </modifyxml>
-        </sequential>
-    </macrodef>
-
-</project>
diff --git a/bin/xml/ts.rar.xml b/bin/xml/ts.rar.xml
deleted file mode 100644
index dadb0f155d..0000000000
--- a/bin/xml/ts.rar.xml
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
-    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
-
--->
-
-<project name="RarImport" basedir="." default="usage">
-
-    <!-- IMPORTS -->
-    <import file="./ts.common.xml"/>
-
-    <!-- LOCAL PROPERTY DEFINITIONS -->
-    
-    <!-- MACROS -->
-    <macrodef name="ts.rar">
-
-    <!--
-        The ts.rar task allows users to build connector archives.  By default all classes
-        under TS_HOME/classes/<pkg.dir> are included in the generated archive.  Users
-        may specify additional content using nested fileset and zipfileset elements.
-        User may also tweak the contents of the generated archive by specifying various
-        attribute values, see the attribute and element tables for details.
-
-        Examples:
-
-        <ts.rar descriptor="ejb_sam_Hello_connector.xml" 
-                archivename="ejb_sam_Hello"/>
-
-        This example builds an EJB archive named ejb_sam_Hello.rar.  The deployment
-        descriptor in the connector archive, ra.xml, is specified using the descriptor
-        attribute.  Note, the ejb_sam_Hello_connector.xml file ends up in the connector archive as
-        the META-INF/ra.xml with no diffs.  The jars added to the archive are the
-        default jars, TS_HOME/dist/<pkg.dir>/**/*.jar.  Where <pkg.dir> is the
-        package name of the test being built.
- 
-
-        <ts.rar descriptor="ejb_sam_Hello_connector.xml" 
-                archivename="ejb_sam_Hello"/>
-          <fileset dir="TS_HOME/classes" includes="<some-package>/*.class"/>
-          <fileset dir="TS_HOME/classes" includes="<some-other-package>/*.class"/>
-        </ts.rar>
-
-        This example is the same as the previous example except the user has opted to add
-        additional classes in addition to the default jars.  The additional classes are
-        specified using nested fileset elements.  Note, users may specify additional classes
-        using nested fileset or zipfileset elements.
-
-
-        <ts.rar descriptor="ejb_sam_Hello_connector.xml" 
-                archivename="ejb_sam_Hello"/>
-                includedefaultfiles="false">
-          <fileset dir="TS_HOME/classes" includes="<some-package>/*.class"/>
-          <fileset dir="TS_HOME/classes" includes="<some-other-package>/*.class"/>
-        </ts.rar>
-
-        This example is the same as the previous example except the user has opted
-        to add additional classes instead of the default jars.  The additional classes
-        are specified using nested fileset elements.  Note, users may specify additional
-        classes using nested fileset or zipfileset elements.
-
-
-        <ts.rar descriptor="ejb_sam_Hello_connector.xml" 
-                archivename="ejb_sam_Hello"/>
-                excludedfiles="B*.jar>
-        </ts.rar>
-
-        This example excludes all jar files that start with "B" that live in the
-        TS_HOME/dist/${pkg.dir}.  If the TS_HOME/dist/${pkg.dir} contained the jars A.jar,
-        B1.jar, B2.jar and C.jar, only jars A and C would end up in the archive.  Using the
-        excludedfiles attribute is another way of customizing the content of the archive by excluding
-        some of the default content.  Users can also use the includedefaultfiles attribute to exclude
-        all default content but the user must then use nested filesets and or zipfilesets to include
-        the appropriate content.  Using the excludedfiles attribute may be simpler in some cases.
-
-        To continue this example, the following XML does the exact same thing as the example above
-        but it uses the includedefaultfiles attribute and a nested fileset element.
-
-        <ts.rar descriptor="ejb_sam_Hello_connector.xml" 
-                archivename="ejb_sam_Hello"/>
-                includedefaultfiles="false">
-          <fileset dir="TS_HOME/classes" includes="${pkg.dir}/A.class, ${pkg.dir}/C.class"/>
-        </ts.rar>
-
-      -->
-
-        <attribute name="descriptor"
-                   default=""        
-                   description="Deployment descriptor added to the archive if the archive requires a deployment descriptor"/>
-                              
-        <attribute name="permissionsdescriptor"
-                   default=""        
-                   description="Permisssions descriptor added to the archive if the archive requires a deployment descriptor"/>
-                   
-        <attribute name="manifest"
-                   default=""
-                   description="Manifest to be used within the archive"/>
-        
-        <attribute name="archivename"   
-                   description="Archive name minus the file suffix"/>
-                   
-        <attribute name="descriptordir"
-                   default="${src.dir}/${pkg.dir}"
-                   description="Directory containing the deployment descriptor"/>           
-
-        <attribute name="permissionsdescriptordir"
-                   default="${src.dir}/${pkg.dir}"
-                   description="Directory containing the permissions descriptor"/>           
-        
-        <attribute name="includedefaultfiles"
-                   default="true"
-                   description="Include default files in the component archive"/>
-
-        <attribute name="excludedfiles"
-                   default=""
-                   description="A comma separated list of file expressions to exclude from the set of default included files.  This list of file expressions is relative to the ${dist.dir}/${pkg.dir} directory."/>
-
-        <element name="jar-elements" implicit="yes" optional="true"
-                 description="The content to be added to the archive"/>
-        
-        <sequential>
-        
-        <!-- Define commmon preset regardless of includedefaultfiles value-->
-        <presetdef name="component.rar">
-            <_component descriptor="@{descriptor}"
-                        permissionsdescriptor="@{permissionsdescriptor}"
-                       manifest="@{manifest}"
-                       archivename="@{archivename}"
-                       archivesuffix=".rar"
-                       descriptordir="@{descriptordir}"
-                       permissionsdescriptordir="@{permissionsdescriptordir}"
-                       internaldescriptorname="META-INF/ra.xml">
-            </_component>
-        </presetdef>
-        
-        <if>
-          <istrue value="@{includedefaultfiles}"/>
-        <then>
-          <component.rar>
-              <fileset dir="${dist.dir}/${pkg.dir}"
-                       includes="**/*.jar"
-                       excludes="@{excludedfiles}"/>
-              <jar-elements/>
-          </component.rar>
-        </then>
-        <else>
-          <component.rar>
-            <jar-elements/>
-          </component.rar>
-        </else>
-        </if>
-        </sequential>
-    </macrodef>
-    
-    <!-- PRESETS -->
-    
-    <!-- TARGETS -->
-     
-</project>
diff --git a/bin/xml/ts.top.import.xml b/bin/xml/ts.top.import.xml
deleted file mode 100644
index c35503056e..0000000000
--- a/bin/xml/ts.top.import.xml
+++ /dev/null
@@ -1,1081 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
-    Copyright (c) 2018, 2022 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
-
--->
-
-<project name="TopImport" basedir="." default="usage">
-
-    <!-- 
-    This is the main import file for the top level ${bin.dir}/build.xml
-    that exists in each deliverable.  It contains targets, macrodefs, 
-    presetdefs, and properties that are necessary for most top level
-    ${bin.dir}/build.xml files.  Whenever possible, these definitions
-    should be used and not be overridden by a deliverable's 
-    ${bin.dir}/build.xml file.
-    -->
-    
-    <dirname property="TopImport.basedir" file="${ant.file.TopImport}"/>
-    
-    <!-- IMPORTS -->
-    <import file="./ts.vehicles.xml"/>
-    
-    <!-- PROPERTIES -->
-    <condition property="noSecurityManager" value="true">
-        <javaversion atleast="18"/>
-    </condition>
-    <property name="noSecurityManager" value="false"/>
-
-    <!-- Set the archives to deploy - default to wars-->
-    <target name="setup.archive.set">
-        <fileset dir="${dist.dir}/${pkg.dir}" id="deploy.vi.archive.set">
-            <include name="**/*.war"/>
-            <exclude name="**/vi_built*.war"/>
-            <exclude name="**/*ejbembed*"/>
-            <exclude name="**/ts_dep/**"/>
-        </fileset>
-
-        <fileset dir="${dist.dir}/${pkg.dir}" id="deploy.ri.archive.set">
-            <include name="**/vi_built*.war"/>
-            <exclude name="**/*ejbembed*"/>
-            <exclude name="**/ts_dep/**"/>
-        </fileset>
-
-        <if>
-            <isset property="all.test.dir"/>
-            <then>
-                <elementappend original="${all.test.dir}" suffix="**/*.war" property="archive.files"/>
-                <elementappend original="${all.test.dir}" suffix="**/vi_built*.war" property="archive.files.vibuilt"/>
-                <fileset dir="${dist.dir}"
-                         includes="${archive.files}"
-                         excludes="${archive.files.vibuilt}"
-                         id="deploy.all.vi.archive.set">
-                </fileset>
-
-                <!--set for vibuilt archives-->
-                <fileset dir="${dist.dir}"
-                         includes="${archive.files.vibuilt}"
-                         id="deploy.all.ri.archive.set">
-                </fileset>
-            </then>
-            <else>
-                <fileset dir="${dist.dir}"
-                         id="deploy.all.vi.archive.set">
-                    <include name="**/*.war"/>
-                    <exclude name="**/*ejbembed*"/>
-                    <exclude name="**/vi_built*.war"/>
-                    <exclude name="**/ts_dep/**"/>
-                </fileset>
-
-                <!--set for vibuilt archives-->
-                <fileset dir="${dist.dir}"
-                         id="deploy.all.ri.archive.set">
-                    <include name="**/vi_built*.war"/>
-                    <exclude name="**/*ejbembed*"/>
-                    <exclude name="**/ts_dep/**"/>
-                </fileset>
-            </else>
-        </if>
-    </target>
-        
-    <!-- MACROS -->
-    
-    <!-- TARGETS -->
-    <target name="build.all" depends="build.all.jars, build.all.tests"
-            description="Builds everything for this deliverable"/>
-    
-    <target name="build.all.tests"
-            description="Builds all tests for this deliverable">
-        <dosubdirs srcdir="${src.dir}"
-                   todo="build" includes="${all.test.dir}"/>
-    </target>
-	
-	<!-- 
-		This target is being provided to make it easier to change values in the ts.jte
-	  file for test automation tools(like Hudson).  If you want to specify default properties
-	  with the target you can, but you need to over ride this target in your top lvl build.xml file
-	  and then do something like the following.
-	  
-		<target name="config.jte">
-			<props.sanitizer file="${bin.dir}/ts.jte" quiet="true">
-				<property name="webServerHost" value="localhost" />
-			</props.sanitizer>
-		</target>
-	   
-	  Below we show how you can set/over ride a property via the command line.  If you want
-	  you can not put any nested properties and still change any property in a given file via the 
-	  command line.
-	  
-	  example: 
-	  			ant -DwebServerHost=""config.jte
-	  
-	  -->
-	<target name="config.jte" description="Use to set specified props in ts.jte file.
-		(see ${ts.home}/bin/xml/ts.top.import.xml for detailed information)">
-		<props.sanitizer file="${bin.dir}/ts.jte" quiet="true"/>
-	</target>
-    
-    <!-- TARGETS -->
-    <macrodef name="check.server" description="Check that the server is up and running">
-
-    <attribute name="host"
-               default=""
-               description="Host for the server"/>
-    <attribute name="port"
-               default=""
-               description="port for the server"/>
-    <sequential>
-        <if>
-            <not>
-                <and>              
-                    <contains string="@{host}" substring="impl."/>
-                    <contains string="@{port}" substring="impl."/>
-                </and>
-            </not>
-            <then>
-                <if>
-                    <socket server="@{host}" port="@{port}" />
-                    <then>
-                        <echo message="Server is Running on host - @{host} and port - @{port}"/>
-                    </then>
-                    <else>
-                        <echo message="Exiting..."/>
-                        <echo message="Server is not Running on host - @{host} and port - @{port}!"/>
-                        <fail message="Start the server and try again!"/>
-                    </else>
-                </if>
-            </then>
-        </if>
-    </sequential>
-    </macrodef>
-
-     <target name="deploy" depends="setup.archive.set"
-           description="Deploy 'CWD' and any children.">
-       <check.keywords.direction/>
-       <if>
-           <isset property="pkg.dir"/>
-       <then>
-
-            <if>
-                <istrue value="${keywords.direction.forward}"/>
-            <then>
-                <check.server host="${impl.vi.host}" port="${impl.vi.port}"/>
-
-                <ant antfile="${common.bin.dir}/xml/impl/${impl.vi}/deploy.xml"
-                     target="-deploy"
-                     inheritRefs="true">
-                     <property name="deploy.dir" value="${impl.vi.deploy.dir}"/>
-                     <reference refid="deploy.vi.archive.set"
-                                torefid="deploy.archive.set"/>
-                </ant>
-            </then>
-            </if>
-
-
-           <for param="riarchive">
-              <fileset refid="deploy.ri.archive.set"/>
-              <sequential>
-                <var name="deploy.to.ri" value="true"/>
-              </sequential>
-            </for>
-
-           <if>
-                <and>
-                    <istrue value="${keywords.direction.reverse}"/>
-                    <istrue value="${deploy.to.ri}"/>
-                </and>
-            <then>
-                <ts.verbose message="Archives to deploy to the RI exist in this test dir"/>
-                
-                <if>
-               <available file="${impl.ri.deploy.dir}"/>
-               <then>
-                   <check.server host="${impl.ri.host}" port="${impl.ri.port}"/>
-                   <echo message="Deploying archives to the RI"/>
-                   <ant antfile="${common.bin.dir}/xml/impl/${impl.ri}/deploy.xml"
-                         target="-deploy"
-                         inheritRefs="true">
-                         <property name="deploy.dir" value="${impl.ri.deploy.dir}"/>
-                         <reference refid="deploy.ri.archive.set"
-                                    torefid="deploy.archive.set"/>
-                   </ant>
-               </then>
-               </if>
-           </then>
-           </if>
-       </then>
-       <else>
-           <fail message="You must be in a test directory to run the 'deploy' target."/>
-       </else>
-       </if>
-   </target>
-
-   <target name="undeploy" depends="setup.archive.set"
-           description="Undeploy archives for tests under this directory.">
-
-       <check.keywords.direction/>
-       <if>
-           <isset property="pkg.dir"/>
-       <then>
-           <if>
-                <istrue value="${keywords.direction.forward}"/>
-            <then>
-                <check.server host="${impl.vi.host}" port="${impl.vi.port}"/>
-                <ant antfile="${common.bin.dir}/xml/impl/${impl.vi}/deploy.xml"
-                     target="-undeploy"
-                     inheritRefs="true">
-                     <property name="deploy.dir" value="${impl.vi.deploy.dir}"/>
-                     <reference refid="deploy.vi.archive.set"
-                                torefid="deploy.archive.set"/>
-                </ant>
-            </then>
-            </if>
-
-            <for param="riarchive">
-              <fileset refid="deploy.ri.archive.set"/>
-              <sequential>
-                <var name="undeploy.from.ri" value="true"/>
-              </sequential>
-            </for>
-
-           <if>
-                <and>
-                    <istrue value="${keywords.direction.reverse}"/>
-                    <istrue value="${undeploy.from.ri}"/>
-                </and>
-            <then>
-                <echo message="Archives to undeploy from the RI exist in this test dir"/>
-                <if>
-               <available file="${impl.ri.deploy.dir}"/>
-               <then>
-                   <check.server host="${impl.ri.host}" port="${impl.ri.port}"/>
-                   <echo message="Undeploying archives from the RI"/>
-                   <ant antfile="${common.bin.dir}/xml/impl/${impl.ri}/deploy.xml"
-                         target="-undeploy"
-                         inheritRefs="true">
-                         <property name="deploy.dir" value="${impl.ri.deploy.dir}"/>
-                         <reference refid="deploy.ri.archive.set"
-                                    torefid="deploy.archive.set"/>
-                   </ant>
-               </then>
-               </if>
-           </then>
-           </if>
-       </then>
-       <else>
-           <fail message="You must be in a test directory to run the 'undeploy' target."/>
-       </else>
-       </if>
-   </target>
-
-   <target name="deploy.all" depends="setup.archive.set"
-           description="Deploy all archives.">
-        <check.keywords.direction/>
-        <if>
-            <istrue value="${keywords.direction.forward}"/>
-        <then>
-            <check.server host="${impl.vi.host}" port="${impl.vi.port}"/>
-            <ant antfile="${common.bin.dir}/xml/impl/${impl.vi}/deploy.xml"
-                 target="-deploy.all"
-                 inheritRefs="true">
-                 <property name="deploy.dir" value="${impl.vi.deploy.dir}"/>
-                 <reference refid="deploy.all.vi.archive.set"
-                            torefid="deploy.all.archive.set"/>
-            </ant>
-        </then>
-        </if>
-
-
-       <for param="riarchive">
-          <fileset refid="deploy.all.ri.archive.set"/>
-          <sequential>
-            <ts.verbose message="Archives to deploy to the RI exist"/>
-            <var name="deploy.to.ri" value="true"/>
-          </sequential>
-        </for>
-
-       <if>
-            <and>
-                <istrue value="${keywords.direction.reverse}"/>
-                <istrue value="${deploy.to.ri}"/>
-            </and>
-        <then>
-
-            <if>
-           <available file="${impl.ri.deploy.dir}"/>
-           <then>
-               <check.server host="${impl.ri.host}" port="${impl.ri.port}"/>
-               <echo message="Deploying archives to the RI"/>
-               <ant antfile="${common.bin.dir}/xml/impl/${impl.ri}/deploy.xml"
-                     target="-deploy.all"
-                     inheritRefs="true">
-                     <property name="deploy.dir" value="${impl.ri.deploy.dir}"/>
-                     <reference refid="deploy.all.ri.archive.set"
-                                torefid="deploy.all.archive.set"/>
-               </ant>
-           </then>
-           </if>
-       </then>
-       </if>
-   </target>
-
-   <target name="undeploy.all" depends="setup.archive.set"
-           description="Undeploy all archives.">
-       <check.keywords.direction/>
-        <if>
-            <istrue value="${keywords.direction.forward}"/>
-        <then>
-            <check.server host="${impl.vi.host}" port="${impl.vi.port}"/>
-            <ant antfile="${common.bin.dir}/xml/impl/${impl.vi}/deploy.xml"
-                 target="-undeploy.all"
-                 inheritRefs="true">
-                 <property name="deploy.dir" value="${impl.vi.deploy.dir}"/>
-                 <reference refid="deploy.all.vi.archive.set"
-                            torefid="deploy.all.archive.set"/>
-            </ant>
-        </then>
-        </if>
-
-
-       <for param="riarchive">
-          <fileset refid="deploy.all.ri.archive.set"/>
-          <sequential>
-            <ts.verbose message="Archives to deploy to the RI exist"/>
-            <var name="deploy.to.ri" value="true"/>
-          </sequential>
-        </for>
-
-       <if>
-            <and>
-                <istrue value="${keywords.direction.reverse}"/>
-                <istrue value="${deploy.to.ri}"/>
-            </and>
-        <then>
-
-            <if>
-           <available file="${impl.ri.deploy.dir}"/>
-           <then>
-               <check.server host="${impl.ri.host}" port="${impl.ri.port}"/>
-               <echo message="Deploying archives to the RI"/>
-               <ant antfile="${common.bin.dir}/xml/impl/${impl.ri}/deploy.xml"
-                     target="-undeploy.all"
-                     inheritRefs="true">
-                     <property name="deploy.dir" value="${impl.ri.deploy.dir}"/>
-                     <reference refid="deploy.all.ri.archive.set"
-                                torefid="deploy.all.archive.set"/>
-               </ant>
-           </then>
-           </if>
-       </then>
-       </if>
-   </target>
-    
-    <target name="tsharness"
-            description="Builds the tsharness jar">
-        <ant antfile="build.xml" dir="${ts.home}/src/com/sun/ts/lib" 
-             target="build" />
-    </target>
-    
-    <target name="build.all.jars"
-            description="Builds the tsharness jar and deliverable library jar">
-        <ant antfile="build.xml" dir="${ts.home}/src/com/sun/ts/lib" 
-             target="build"/>
-        <antcall target="tslib"/>
-    </target>
-    
-    <target name="tslib">
-        <echo message="No tslib target implemented for this deliverable"/>
-    </target>
-    
-    <!-- === internal targets to manage javatest work.dir and report.dir.=== -->
-    <!-- === See ts.jte for instruction                                  === -->
-    
-    <target name="set.prior.status">
-        <condition property="prior.status.isset">
-            <not>
-                <or>
-                    <equals arg1="${priorStatus}" arg2="$${priorStatus}"/>
-                    <equals arg1="${priorStatus}" arg2=""/>
-                </or>
-            </not>
-        </condition>
-    </target>
-    
-    <target name="prior.status" depends="set.prior.status">
-        <condition property="prior.status" value="${priorStatus}">
-            <istrue value="${prior.status.isset}"/>
-        </condition>
-        <property name="prior.status" value="pass,fail,error,notRun"/>
-    </target>
-    
-    <!-- for default run, we pass "all" keyword -->
-    <target name="set.keywords">
-        <if>
-            <or>
-                <not>
-                    <isset property="keywords"/>
-                </not>
-                <equals arg1="${keywords}" arg2=""/> 
-            </or>
-            <then>
-                <var name="keywords" value="all"/>
-            </then>
-        </if> 
-        <echo message="keywords are set to:  ${keywords}"/>
-    </target>
-    
-    <target name="check.results.mode" depends="prior.status">
-        <!-- must be set to backup, overwrite or append -->
-        <echo message="prior.status = ${prior.status}"/>
-        <condition property="report.mode" value="append">
-            <istrue value="${prior.status.isset}"/>
-        </condition>
-        <condition property="report.mode" value="overwrite">
-            <and>
-                <equals arg1="${if.existing.work.report.dirs}" arg2="auto"/>
-                <available file="${ts.home}/install" type="dir"/>
-            </and>
-        </condition>
-        <condition property="report.mode" value="append">
-            <equals arg1="${if.existing.work.report.dirs}" arg2="auto"/>
-        </condition>
-        <property name="report.mode" value="${if.existing.work.report.dirs}"/>
-        <echo message="Results Mode is ${report.mode}"/>
-    </target>
-    
-    <target name="prepare.work.report.dirs" 
-            depends="check.results.mode, check.existing.dirs, 
-                     delete.existing.dirs, backup.work.dir, backup.report.dir, 
-                     set.report.arg">
-        <mkdir dir="${work.dir}"/>
-        <property name="report.arg" value=""/>
-    </target>
-    
-    <target name="check.existing.dirs">
-        <condition property="overwrite.existing.dirs">
-            <equals arg1="${report.mode}" arg2="overwrite"/>
-        </condition>
-        <condition property="no.report">
-            <or>
-                <equals arg1="${report.dir}" arg2="$${report.dir}"/>
-                <equals arg1="${report.dir}" arg2="none"/>
-                <equals arg1="${report.dir}" arg2="no"/>
-                <and>
-                    <istrue value="${in.workspace}"/>
-                    <not>
-                        <isset property="report.target.called"/>
-                    </not>
-                </and>
-
-            </or>
-        </condition>
-        <condition property="backup.existing.work.dir">
-            <and>
-                <available file="${work.dir}" type="dir"/>
-                <equals arg1="${report.mode}" arg2="backup"/>
-            </and>
-        </condition>
-        <condition property="backup.existing.report.dir">
-            <and>
-                <available file="${report.dir}" type="dir"/>
-                <equals arg1="${report.mode}" arg2="backup"/>
-            </and>
-        </condition>
-    </target>
-    
-    <target name="delete.existing.dirs" if="overwrite.existing.dirs"
-            depends="check.existing.dirs">
-        <delete failonerror="no" includeEmptyDirs="yes">
-            <fileset dir="${work.dir}"/>
-        </delete>
-    </target>
-    
-    <target name="backup.work.dir" if="backup.existing.work.dir"
-            depends="check.existing.dirs">
-        <move todir="${work.dir}_${TSTAMP}_${DSTAMP}_bak" 
-              preservelastmodified="yes"
-              overwrite="yes" includeEmptyDirs="yes" failonerror="no">
-            <fileset dir="${work.dir}"/>
-        </move>
-    </target>
-    
-    <target name="backup.report.dir" if="backup.existing.report.dir" 
-            unless="no.report" depends="check.existing.dirs">
-        <move todir="${report.dir}_${TSTAMP}_${DSTAMP}_bak" 
-              preservelastmodified="yes"
-              overwrite="yes" includeEmptyDirs="yes" failonerror="no">
-            <fileset dir="${report.dir}"/>
-        </move>
-    </target>
-    
-    <target name="set.report.arg" unless="no.report" 
-            depends="check.existing.dirs">
-        <property name="report.arg" value="-writereport ${report.dir}"/>
-    </target>
-    <!-- === end internal targets to manage javatest work.dir and report.dir. === -->
-
-    <target name="get.client" if="test" unless="test.client">
-        <if>
-            <isset property="test"/>
-        <then>
-            <for param="file">
-              <path>
-                <fileset dir="${src.dir}/${pkg.dir}" includes="*lient*.java"/>
-              </path>
-              <sequential>
-                  <echo message="file= @{file}"/>
-                <propertyregex property="test.client"  input="@{file}"
-                  regexp=".*[\/|\\](.*)\.java" select="\1"/>
-              </sequential>
-            </for>
-            <echo message="test.client= ${test.client}"/>
-        </then>
-        </if>
-    </target>
-  
-    <target name="check.selected.test" if="test" depends="get.client">
-        <property name="one.test" value="${test.client}#${test}" />
-    </target>
-
-    <target name="no.selected.test" unless="test">
-        <property name="one.test" value="" />
-    </target>
-
-    <target name="check.java.options" if="env.JAVA_OPTIONS">
-        <property name="java.options" value="${env.JAVA_OPTIONS}" />
-    </target>
-
-    <target name="no.java.options" unless="env.JAVA_OPTIONS">
-        <property name="java.options" value="" />
-    </target>
-    
-  <target name="init">
-        <tstamp/>
-
-        <if>
-            <isset property="env.HARNESS_DEBUG"/>
-            <then>
-                <property name="cts.harness.debug"
-                          value="${env.HARNESS_DEBUG}"/>
-            </then>
-            <else>
-                <property name="env.HARNESS_DEBUG" value="false"/>
-                <property name="cts.harness.debug"
-                          value="false"/>
-            </else>
-        </if>
-
-        <property name="common.apps.only" value="false"/>
-        <property name="local.classes" value=""/>
-        <property name="LOCAL_CLASSES" value=""/>
-
-        <property name="same.jvm" value="false"/>
-
-        <condition property="ts.env" value="ts_win32">
-            <and>
-                <os family="windows"/>
-            </and>
-        </condition>
-        <condition property="ts.env" value="ts_unix">
-            <and>
-                <os family="unix"/>
-            </and>
-        </condition>
-
-    </target>
-    
-    <target name="translatepath">
-        <!--Empty target meant to be overriden by files that import this file-->
-    </target>
-    
-    <target name="javatest.batch" 
-            depends="init, set.keywords, prepare.work.report.dirs, 
-                     check.selected.test, no.selected.test, check.java.options, 
-                     no.java.options, translatepath">       
-        <ts.javatest.batch/>
-    </target>
-    
-    <target name="runclient.nobinaryfinder" 
-            depends="init, set.keywords, prepare.work.report.dirs, 
-                     check.selected.test, no.selected.test, check.java.options, 
-                     no.java.options, translatepath">       
-        <ts.javatest.batch.nobinaryfinder/>    
-    </target>
-    
-    <target name="runclient" 
-            depends="init, set.keywords, prepare.work.report.dirs, 
-                     check.selected.test, no.selected.test, check.java.options, 
-                     no.java.options, translatepath"> 
-        <ts.javatest.batch/>
-    </target>
-    
-    <target name="gui" 
-            depends="init, check.java.options, no.java.options, translatepath"
-            description="Starts the Javatest GUI"> 
-        <javatest.gui/>
-    </target>
-    
-    <target name="run.all"
-            description="Runs all tests in batch mode"> 
-        <property name="tests.string" value=""/>
-        <echo message="Running all tests from the following directories..."/>
-        <for list="${all.test.dir}" param="ii" trim="true">
-          <sequential>
-            <var name="tests.string" value="${tests.string} @{ii}"/>
-          </sequential>
-        </for>
-        <antcall target="runclient"/>
-    </target>
-    
-    <!-- target to generate test report for the complete testsuite or selected -->
-    <!-- test directories, based on current work.dir.  For example,            -->
-    <!-- ant report                                      complete testsuite  -->
-    <!-- ant report -Dreport.for=com/sun/ts/tests/samples      samples only  -->
-    <!-- ant report -Df.existing.work.report.dirs=backup  preserve existing  -->
-    <target name="report" 
-            depends="set.report.prop, init, backup.report.dir, set.report.arg, translatepath"
-            description="Generates the test report for all tests in the current work directory"> 
-        <condition property="report.for.arg" value="-tests ${report.for}">
-            <isset property="report.for"/>
-        </condition>
-        <property name="report.for.arg" value=""/>
-        <javatest.report/>
-    </target>
-    <target name="set.report.prop">
-        <property name="report.target.called" value="true"/>
-    </target>
-
-
-    <!-- Targets for creating the JAXB source classes used by DeploymentInfo -->
-    <property name="porting.package"     
-              value="com.sun.ts.lib.implementation.sun.javaee.runtime"/>
-    <property name="porting.package.dir" 
-              value="com/sun/ts/lib/implementation/sun/javaee/runtime"/>
-
-    <target name="clean.jaxb">
-        <antcall target="clean.jaxb.source" />  
-    </target>
-    
-    <!-- clean out the JAXB generated source code -->
-    <target name="clean.jaxb.source">
-    <delete failonerror="false" includeEmptyDirs="true">
-      <fileset dir="${ts.home}/src/${porting.package.dir}">
-        <include name="app/**"/>
-        <include name="appclient/**"/>
-        <include name="web/**"/>
-        <include name="ejb/**"/>
-      </fileset>
-      </delete>
-    </target>
-
-    <!-- tslib depends on bind.dtds -->
-    <target name="bind.dtds">
-    
-    <taskdef name="xjc" classname="com.sun.tools.xjc.XJCTask">
-        <classpath>
-            <pathelement path="${ts.harness.classpath}" />
-        </classpath>
-    </taskdef>
-  
-    <xjc schema="${ts.home}/lib/dtds/sun-application_6_0-0.dtd"
-         binding="${ts.home}/src/${porting.package.dir}/jaxb-cust.xml"
-         destdir="${ts.home}/src"
-         package="${porting.package}.app" fork="true">
-        <arg value="-dtd"/>
-    	<jvmarg value="-DenableExternalEntityProcessing=true"/>
-        <depends  dir="${ts.home}/lib/dtds" 
-                  includes="sun-application_6_0-0.dtd"/>
-        <produces dir="${ts.home}/src/${porting.package.dir}/app" 
-                  includes="**/*"/>
-    </xjc>
-    <xjc schema="${ts.home}/lib/dtds/sun-application-client_6_0-0.dtd"
-         binding="${ts.home}/src/${porting.package.dir}/jaxb-cust.xml"
-         destdir="${ts.home}/src"
-         package="${porting.package}.appclient" fork="true">
-        <arg value="-dtd"/>
-    	<jvmarg value="-DenableExternalEntityProcessing=true"/>
-        <depends  dir="${ts.home}/lib/dtds" 
-                  includes="sun-application-client_5_0-0.dtd"/>
-        <produces dir="${ts.home}/src/${porting.package.dir}/appclient" 
-                  includes="**/*"/>
-    </xjc>
-    <xjc schema="${ts.home}/lib/dtds/sun-ejb-jar_3_1-0.dtd"
-         binding="${ts.home}/src/${porting.package.dir}/jaxb-cust.xml"
-         destdir="${ts.home}/src"
-         package="${porting.package}.ejb" fork="true">
-        <arg value="-dtd"/>
-    	<jvmarg value="-DenableExternalEntityProcessing=true"/>
-        <depends  dir="${ts.home}/lib/dtds" includes="sun-ejb-jar_3_1-0.dtd"/>
-        <produces dir="${ts.home}/src/${porting.package.dir}/ejb" 
-                  includes="**/*"/>
-    </xjc>
-    <xjc schema="${ts.home}/lib/dtds/sun-web-app_3_0-0.dtd"
-         binding="${ts.home}/src/${porting.package.dir}/jaxb-cust.xml"
-         destdir="${ts.home}/src"
-         package="${porting.package}.web" fork="true">
-        <arg value="-dtd"/>
-    	<jvmarg value="-DenableExternalEntityProcessing=true"/>
-        <depends  dir="${ts.home}/lib/dtds" includes="sun-web-app_3_0-0.dtd"/>
-        <produces dir="${ts.home}/src/${porting.package.dir}/web" 
-                  includes="**/*"/>
-    </xjc>
-    </target>
-    
-    <presetdef name="javatest">
-
-        <!-- 
-          The javatest task is a presetdef that sets many of the common 
-          attributes and elements used by both the GUI and batch mode 
-          invocations of javatest with the spider workspace.  To see the preset 
-          values, refer to the included XML below that shows the content of
-          the javatest presetdef.
-        -->
-
-        <java classname="com.sun.javatest.tool.Main" 
-              failonerror="${failOnError}" fork="yes" >
-            <classpath>
-                <pathelement path="${ant.jars}:${ts.harness.classpath}:${class.dir}"/>
-            </classpath>	
-            
-            <sysproperty key="cts.harness.debug" value="${cts.harness.debug}" />
-            <sysproperty key="same.jvm" value="${same.jvm}"/>
-            <sysproperty key="java.compiler" value="NONE"/>
-            <sysproperty key="javatest.maxOutputSize" value="${harness.maxoutputsize}"/>
-            <sysproperty key="javatest.caseSensetiveJtx" value="true"/>
-            <sysproperty key="TS_HOME" value="${ts.home}" />
-            <sysproperty key="ts_home" value="${ts.home}" />
-            <sysproperty key="ts.home" value="${ts.home}" />
-            <sysproperty key="bin.dir" value="${bin.dir}" />
-            <sysproperty key="deliverable.dir" value="${deliverable.dir}" />
-            <sysproperty key="pathsep" value="${pathsep}" />
-            <sysproperty key="local.classes" value="${local.classes}" />
-            <sysproperty key="JAVA_HOME" value="${java.home}"/>
-            <sysproperty key="jdk.home" value="${env.JAVA_HOME}" />
-            <sysproperty key="RI_JAVA_HOME" value="${env.RI_JAVA_HOME}"/>
-            <sysproperty key="JAVA_OPTIONS" value="${java.options}"/>
-            <sysproperty key="cts.jtroutput" value="true"/>
-            <sysproperty key="windir" value="${env.windir}"/>
-            <sysproperty key="TMP" value="${env.TMP}"/>
-            <sysproperty key="SYSTEMROOT" value="${env.SystemRoot}"/>
-            <sysproperty key="LOCAL_CLASSES" value="${local.classes}"/>
-            <sysproperty key="TZ" value="${tz}"/>
-            <sysproperty key="deliverable.class" value="${deliverable.class}"/>
-            <sysproperty key="common.apps.only" value="${common.apps.only}"/>
-            <sysproperty key="javatest.security.noSecurityManager" value="${noSecurityManager}"/>
-            <sysproperty key="harness.executeMode" value="${exec.mode}"/>
-            <sysproperty key="DEPLOY_DELAY_IN_MINUTES" 
-                         value="${deploy.delay.in.minutes}"/>
-            <sysproperty key="javatest.security.allowPropertiesAccess" 
-                         value="true"/>
-            <sysproperty key="java.security.policy" 
-                         value="${bin.dir}/harness.policy"/>
-            <!--
-            <sysproperty key="org.omg.CORBA.ORBInitialHost" value="${orb.host}" />
-            <sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}" />
-            <sysproperty key="com.sun.ejb.home" value="${javaee.home}" />
-            <sysproperty key="ORB_HOST" value="${orb.host}" />
-            <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="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"/>
-            -->
-        </java>
-    </presetdef>
-    
-
-    <presetdef name="javatest.batch">
-
-        <!-- 
-          The javatest.batch task is a presetdef that calls the javatest 
-          presetdef passing the additional XML content needed to invoke 
-          javatest in batch mode.  To see the preset values, refer to the 
-          included XML below that shows the content of the javatest.batch
-          presetdef.
-        -->
-
-        <javatest>
-            <arg line=" -EsysProps" />
-            <arg line=" -batch" />
-            <arg line=" -testsuite ${ts.home}/src" />
-            <arg line=" -workdir ${work.dir}" />
-            <!--<arg line=" -workdir -create ${ts.home}/tmp/deploy_only_workdir" />-->
-            <arg line=" -envFiles ${bin.dir}/ts.jte" />
-            <arg line=" -env ${ts.env}" />
-            <arg line=" -excludeList ${bin.dir}/ts.jtx" />
-            <arg line=" -timeoutFactor ${javatest.timeout.factor}" />
-            <arg line=" -priorStatus ${prior.status}" />
-            <arg line=" -keywords &quot;${keywords}&quot;"/>
-            <arg line=" ${tests.arg}" />
-            <arg line=" -runtests ${report.arg}"/>
-            <jvmarg value="-Xms256m"/>
-            <jvmarg value="-Xmx512m"/>
-        </javatest>    
-    </presetdef>
-    
-
-    <presetdef name="javatest.gui">
-
-        <!-- 
-          The javatest.gui task is a presetdef that calls the javatest presetdef
-          passing the additional XML content needed to invoke the javatest GUI.
-          To see the preset values, refer to the included XML below that shows 
-          the content of the javatest.gui presetdef.
-        -->
-
-        <javatest>
-            <arg    line="-EsysProps" />
-            <jvmarg value="-Xms150m"/>
-            <jvmarg value="-Xmx150m"/>
-        </javatest>    
-    </presetdef>
-    
-    <presetdef name="javatest.report">
-
-        <!-- 
-          The javatest.gui task is a presetdef that calls the javatest presetdef
-          passing the additional XML content needed to invoke the javatest GUI.
-          To see the preset values, refer to the included XML below that shows 
-          the content of the javatest.gui presetdef.
-        -->
-
-        <javatest>
-            <arg line=" -EsysProps" />
-            <arg line=" -batch" />
-            <arg line=" -testsuite ${ts.home}/src" />
-            <arg line=" -workDir ${work.dir}" />
-            <arg line=" -envFiles ${bin.dir}/ts.jte" />
-            <arg line=" -env ${ts.env}" />
-            <arg line=" -excludeList ${bin.dir}/ts.jtx" />
-            <arg line=" ${report.for.arg}" />
-            <arg line="  ${report.arg}"/>
-        </javatest>    
-    </presetdef>
-        
-    <!-- MACROS -->
-    <macrodef name="ts.javatest.batch">
-
-      <sequential>
-        <condition property="tests.string" value="${multiple.tests}">
-            <not>
-                <or>
-                    <equals arg1="${multiple.tests}" arg2="$${multiple.tests}"/>
-                    <equals arg1="${multiple.tests}" arg2=""/>
-                </or>
-            </not>
-        </condition>
-        <condition property="tests.string" 
-                   value="${ts.home}/src/${pkg.dir}/${one.test}">
-            <or>
-                <equals arg1="${multiple.tests}" arg2="$${multiple.tests}"/>
-                <equals arg1="${multiple.tests}" arg2=""/>
-            </or>
-        </condition>
-        <translatepath propname="tests.string" type="initialfile"/>
-        <condition property="tests.arg" value="-tests ${tests.string}">
-            <not>
-                <equals arg1="${tests.string}" arg2=""/>
-            </not>
-        </condition>
-        <condition property="tests.arg" value="">
-            <equals arg1="${tests.string}" arg2=""/>
-        </condition>
-        
-        <property name="failOnError" value="true" />
-        
-        <delete failonerror="false" quiet="true" includeEmptyDirs="true">
-            <fileset dir="${ts.home}/tmp/deploy_only_workdir"/>
-        </delete>
-        
-        <javatest.batch/>
-      </sequential>
-    </macrodef>
-
-    <macrodef name="ts.javatest.batch.nobinaryfinder">
-
-      <sequential>
-        <condition property="tests.string" value="${multiple.tests}">
-            <not>
-                <or>
-                    <equals arg1="${multiple.tests}" arg2="$${multiple.tests}"/>
-                    <equals arg1="${multiple.tests}" arg2=""/>
-                </or>
-            </not>
-        </condition>
-        <condition property="tests.string" 
-                   value="${ts.home}/src/${pkg.dir}/${one.test}">
-            <or>
-                <equals arg1="${multiple.tests}" arg2="$${multiple.tests}"/>
-                <equals arg1="${multiple.tests}" arg2=""/>
-            </or>
-        </condition>
-        <translatepath propname="tests.string" type="initialfile"/>
-        <condition property="tests.arg" value="-tests ${tests.string}">
-            <not>
-                <equals arg1="${tests.string}" arg2=""/>
-            </not>
-        </condition>
-        <condition property="tests.arg" value="">
-            <equals arg1="${tests.string}" arg2=""/>
-        </condition>
-        
-        <property name="failOnError" value="true" />
-        
-        <delete failonerror="false" quiet="true" includeEmptyDirs="true">
-            <fileset dir="${ts.home}/tmp/deploy_only_workdir"/>
-        </delete>
-        
-        <javatest.batch>
-            <sysproperty key="no.binary.finder" value="true" />
-            <sysproperty key="harness.executeMode" value="${harness.executeMode}"/>
-        </javatest.batch>
-      </sequential>
-    </macrodef>
-    
-    <macrodef name="check.keywords.direction">
-        <sequential>
-           <echo message="keywords=${keywords}"/>
-           <if>
-              <or>
-                 <not>
-                     <isset property="keywords"/>
-                 </not>
-                 <contains substring="forward" string="${keywords}" casesensitive="false"/>
-                 <contains substring="all" string="${keywords}" casesensitive="false"/>
-              </or>
-           <then>
-               <property name="keywords.direction.forward" value="true"/>
-           </then>
-           <else>
-               <property name="keywords.direction.forward" value="false"/>
-           </else>
-           </if>
-
-           <if>
-              <or>
-                 <not>
-                     <isset property="keywords"/>
-                 </not>
-                 <contains substring="reverse" string="${keywords}" casesensitive="false"/>
-                 <contains substring="all" string="${keywords}" casesensitive="false"/>
-              </or>
-           <then>
-               <property name="keywords.direction.reverse" value="true"/>
-           </then>
-           <else>
-               <property name="keywords.direction.reverse" value="false"/>
-           </else>
-           </if>
-           <echo message="keywords.direction.forward=${keywords.direction.forward}"/>
-           <echo message="keywords.direction.reverse=${keywords.direction.reverse}"/>
-        </sequential>
-    </macrodef>
-
-    <!--
-        The report.summary task allows you to echo the test result output from
-        specified test directories in ${report.dir}/summary.txt.  This is useful
-        when you have invoked multiple runclient invocations and want to display
-        the sum results of all the runs afterwards.  The dirs attribute should
-        be set to the list of dirs (, separated) that you want the results for.
-
-        Examples:
-
-        <report.summary dirs="com/sun/ts/tests/ejb30/persistence/annotations,    
-                             com/sun/ts/tests/ejb30/persistence/basic"/>
-      -->
-      <macrodef name="report.summary">
-        <attribute name="dirs"
-                   default=""
-                   description="Space separate list of test dirs to report"/>
-               
-        <sequential>
-           <var name="counter" value="0"/>
-           <var name="passedcounter" value="0"/>
-           <var name="failedcounter" value="0"/>
-           <var name="errorcounter" value="0"/>
-           <var name="notruncounter" value="0"/>
-           <for param="line.string" list="@{dirs}" delimiter=",, ">
-           <sequential>
-           <var name="dirs.report.summary" unset="true"/>
-           <loadfile
-              property="dirs.report.summary"
-              srcFile="${report.dir}/text/summary.txt"
-              failonerror="false">
-                <filterchain> 
-                    <linecontains>
-                        <contains value="@{line.string}"/>                       
-                    </linecontains>
-                    <linecontains negate="true">
-                        <contains value="Not run."/>                       
-                    </linecontains>
-                    <tokenfilter>
-                        <replacestring from=" " to="."/>
-                    </tokenfilter>
-                </filterchain>
-            </loadfile>
-            
-           <if>
-               <isset property="dirs.report.summary"/>
-           <then>
-               <echo message="${dirs.report.summary}"/>
-               <for param="lineprop.string" list="${dirs.report.summary}" delimiter="${line.separator}">
-                    <sequential>
-                        <math result="counter" operand1="${counter}" 
-                              operation="+" operand2="1" datatype="int"/>    
-                        
-                        <if>
-                            <contains string="@{lineprop.string}" substring="Passed."/>
-                            <then>
-                                <math result="passedcounter" operand1="${passedcounter}" 
-                                      operation="+" operand2="1" datatype="int"/>
-                            </then>
-                        <elseif>
-                             <contains string="@{lineprop.string}" substring="Failed."/>
-                             <then>
-                                <math result="failedcounter" operand1="${failedcounter}" 
-                                      operation="+" operand2="1" datatype="int"/>
-                             </then>
-                        </elseif>
-                        <elseif>
-                             <contains string="@{lineprop.string}" substring="Error."/>
-                             <then>
-                                <math result="errorcounter" operand1="${errorcounter}" 
-                                      operation="+" operand2="1" datatype="int"/>
-                             </then>
-                        </elseif>
-                        </if>
-                    </sequential>
-                </for>
-                </then>
-                <else>
-                    <echo message="Warning - Cannot find any test results from directory - @{line.string}"/>
-                </else>
-            </if>
-           </sequential>
-           </for>
-           
-           <echo message="********************************************************************************"/>
-           <echo message="Completed running ${counter} tests."/>
-           <echo message="Number of Tests Passed = ${passedcounter}"/>
-           <echo message="Number of Tests Failed = ${failedcounter}"/>
-           <echo message="Number of Tests with Errors = ${errorcounter}"/>
-           <echo message="********************************************************************************"/>
-           
-        </sequential>
-    </macrodef>
-    
-</project>
diff --git a/bin/xml/ts.vehicles.xml b/bin/xml/ts.vehicles.xml
deleted file mode 100644
index 96752b418f..0000000000
--- a/bin/xml/ts.vehicles.xml
+++ /dev/null
@@ -1,1404 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
-    Copyright (c) 2018, 2022 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
-
--->
-
-<project name="VehiclesImport" basedir="." default="usage">
-
-    <!-- IMPORTS -->
-    <import file="./ts.clientjar.xml"/>
-    <import file="./ts.ejbjar.xml"/>
-    <import file="./ts.war.xml"/>
-    <import file="./ts.par.xml"/>
-    <import file="./ts.rar.xml"/>
-    <import file="./ts.ear.xml"/>
-
-    <!-- MACROS -->
-    <macrodef name="ts.vehicles">
-
-    <!--
-      The ts.vehicles task is responsible for building all vehicle archives that a test runs in.
-      Note, this only applies to vehicles tests.  If a test is not a vehicle test users should use
-      the component archive tasks.  The vehicle archives built by this task are determined by
-      examining the content of the TS_HOME/src/vehicle.properties file.  This file maps test
-      directories to space delimited lists of vehicles.  When a test is built and that test
-      lives under a directory that has an entry in the vehicle.properties file, the test is built
-      for the vehicles mapped to that test directory.  Note, the mapping hueristic allows users
-      to specify a directory at any level.  Any vehicle test living under this directory will be
-      built for the specified vehicles.
-
-      Examples:
- 
-      These example assumes we are in a test directory under com/sun/ts/tests/samples/jdbc.
-      Specifically, the test lives under the directory com/sun/ts/tests/samples/jdbc/ee/testConn.
-
-      <ts.vehicles name="testConnClient"/>
-
-      This example builds the four vehicle archives that this test runs in.  Based on the content
-      of the TS_HOME/src/vehicle.properties file, we see the four vehicles
-      (ejb, servlet, jsp and appclient):
-
-        com/sun/ts/tests/samples/jdbc = ejb servlet jsp appclient
-
-      The archives that are generated are:
-        testConnClient_appclient_vehicle.ear
-        testConnClient_jsp_vehicle.ear
-        testConnClient_servlet_vehicle.ear
-        testConnClient_ejb_vehicle.ear
-
-
-      <ts.vehicles name="testConnClient">
-        <jar-elements>
-          <fileset dir="TS_HOME/classes" includes="com/sun/ts/tests/utils/*.class"/>
-        </jar-elements>
-      </ts.vehicles>
-
-      This example is the same as the previous example except the user has opted to include additional
-      content in all of the vehicle archives as well as the default content.  The nested jar-elements
-      tells the task to add every class file found under the directory
-      TS_HOME/classes/com/sun/ts/tests/utils to all the component vehicle archives.  Meaning any class
-      file found in TS_HOME/classes/com/sun/ts/tests/utils is added to every component archive, in this
-      case the vehicles are; ejb, servlet, jsp and appclient.
-
-     
-      <ts.vehicles name="testConnClient"
-                   classes="com/sun/ts/tests/utils/*.class"/>
-
-      This example above is the same as the previous example except the user used the classes attribute
-      to specify a set of classes that should be added to every vehicle archive.  The difference between
-      the examples is where the classes are added in the vehicle archive.  In the first example the
-      classes are added to the root directory of the archive.  In this example the classes are added
-      to the appropriate location in the vehicle archive.  Meaning classes are added to the root of
-      the archive for non-web vehicles and to the WEB-INF/classes directory of web vehicles.  Also
-      note that the classes specified using the classes attribute must be relative to the
-      TS_HOME/classes directory.  See the classes entry in the attribute table for ore information.
-
-
-      <ts.vehicles name="testConnClient">
-        <jar-elements>
-          <zipfileset dir="." includes="LICENSE" prefix="META-INF"/>
-        </jar-elements>
-        <ejb-elements>
-          <fileset dir="TS_HOME/classes" includes="com/sun/ts/tests/ejb/utils/*.class"/>
-          <zipfileset dir="." include="ejb-readme" prefix="META-INF"/>
-        </ejb-elements>
-        <client-elements>
-          <fileset dir="TS_HOME/classes" includes="com/sun/ts/tests/client/utils/*.class"/>
-          <zipfileset dir="." include="client-readme" prefix="META-INF"/>
-        </client-elements>
-        <servlet-elements>
-          <zipfileset dir="TS_HOME/classes" includes="com/sun/ts/tests/servlet/utils/*.class"
-                      prefix="WEB-INF/classes"/>
-          <zipfileset dir="." include="servlet-readme" prefix="META-INF"/>
-        </servlet-elements>
-        <jsp-elements>
-          <zipfileset dir="TS_HOME/classes" includes="com/sun/ts/tests/jsp/utils/*.class"
-                   prefix="WEB-INF/classes"/>
-          <zipfileset dir="." include="jsp-readme" prefix="META-INF"/>
-        </jsp-elements>
-      </ts.vehicles>
-      
-      This example adds content to every vehicle as well as vehicle specific content.  The
-      content specified by the filesets and zipfilesets nested nested under the jar-elements is added
-      to every vehicle archive that is generated.  The nested filesets and zipfilesets nested under the
-      other *-elements is added to that specific vehicle archive only.  So in this example, a LICENSE
-      file is added to the META-INF directory of every vehicle archive.  Each vehicle has vehicle
-      specific content, namely a set of utility classes added to tyhe appropriate location in the
-      archive.  As well as a vehicle specifc readme added to the META-INF directory.
-
-    -->
-        
-        <attribute name="name"    
-                   description="Name used to construct vehicle archive names"/>
-        
-        <attribute name="manifest"
-                   description="Custom manifest to be included in each vehicle archive"
-                   default=""/>
-
-        <attribute name="earpermissionsdescriptor"
-                   default=""        
-                   description="Permisssions descriptor added to the archive if the archive requires a deployment descriptor"/>
-        
-        <attribute name="earpermissionsdescriptordir"
-                   default="${src.dir}/${pkg.dir}"
-                   description="Directory containing the permissions descriptor"/>           
-       
-        <attribute name="excludedfiles"
-                   default=""    
-                   description="List of files to exclude from all vehicle archives relative to the classes directory."/>
-     
-        <attribute name="includedefaultfiles"
-                   default="true"    
-                   description="Include default files in the component archive.  This attribute only affects the appclient vehicle."/>
-                                  
-        <attribute name="classes"
-                   default=""    
-                   description="A comma separated list of class file regular expressions to include in each vehicle that gets built, relative to the TS_HOME/classes directory"/>
-
-        <attribute name="vehicleoverride"
-                   default=""
-                   description="A single vehicle to process. if set, this overrides the default vehicles that are set in vehicle.properties"/>
-        
-        <attribute name="buildleveloverride"
-                   default="${build.level}"
-                   description="Set to 1 (classes), 2 (wars, jars, etc.), or 3 
-                   (ears).  This overrides the default build.level property for 
-                   the deliverable."/>
-
-        <attribute name="singleear"
-                   default="false"
-                   description="If true, bundle all vehicle component archives into a single Java EE Ear file.  If false, a unique Ear will
-                                be used for each vehicle component archive.  The default is false"/>
-
-        <element name="ejb-elements"     optional="true"
-                 description="Set of filesets and/or zipfilesets to be added to the ejb component archive"/>
-
-        <element name="client-elements"  optional="true"
-                 description="Set of filesets and/or zipfilesets to be added to the client component archive, the component archive in the EJB vehicle as well as the appclient vehicle"/>
-
-        <element name="servlet-elements" optional="true"
-                 description="Set of filesets and/or zipfilesets to be added to the servlet vehicle archive"/>
-
-        <element name="jsp-elements"     optional="true"
-                 description="Set of filesets and/or zipfilesets to be added to the jsp vehicle archive"/>
-
-        <element name="wsservlet-elements"     optional="true"
-                 description="Set of filesets and/or zipfilesets to be added to the wsservlet archives"/>
-
-        <element name="wsejb-elements"     optional="true"
-                 description="Set of filesets and/or zipfilesets to be added to the wsejb archives"/>
-
-        <element name="ear-elements"     optional="true"
-                 description="Set of filesets and/or zipfilesets to be added to all vehicle ear archives"/>
-
-        <element name="jar-elements"     optional="true"
-                 description="Set of filesets and/or zipfilesets to be added to all vehicle archives"/>        
-                
-        <sequential>
-        
-        <determine.vehicles/>
-
-        <!-- determine if the default list of vehicles should be built or a specified one -->
-        <if>
-            <equals arg1="@{vehicleoverride}" arg2=""/>
-        <then>
-            <var name="vehiclestobuild" value="${vehicles}"/>
-        </then>
-        <elseif>
-            <contains substring="@{vehicleoverride}" string="${vehicles}"/>
-        <then>
-            <var name="vehiclestobuild" value="@{vehicleoverride}"/>
-        </then>
-        </elseif>
-        <else>
-            <var name="vehiclestobuild" value="none"/>
-        </else>
-        </if>
-
-        <echo message="vehiclestobuild:    ${vehiclestobuild}"/>
-        <echo message="vehicleoverride:    @{vehicleoverride}"/>
-
-        <if>
-            <not>
-                <equals arg1="${vehiclestobuild}" arg2="none"/>
-            </not>
-        <then>
-
-            <property name="descriptor.dir" 
-                      value="${ts.home}/tmp"/>
-
-            <if>
-                <and>
-                    <istrue value="@{singleear}"/>
-                    <or>
-                        <contains substring="servlet" string="${vehiclestobuild}"/>
-                        <contains substring="web" string="${vehiclestobuild}"/>
-                        <contains substring="jsp" string="${vehiclestobuild}"/>
-                    </or>
-                </and>
-            <then>
-                <delete file="${harness.temp.directory}/@{name}_vehicles.ear.sun-application.xml" quiet="true"/>
-            </then>
-            </if>
-        
-            <!-- Cycle through the vehicles and package-->
-            <for list="${vehiclestobuild}" param="vehicle" delimiter=" ">
-                
-                <sequential>
-                <echo message="name:    @{name}"/>
-                <echo message="vehicle: @{vehicle}"/>
-                 
-                <var name="runner.classes" 
-                     value="${vehicle.pkg.dir}/**/*Runner.class, ${vehicle.pkg.dir}/**/*Runner$$*.class "/>
-                 
-                <var name="vehicle.name" 
-                     value="@{vehicle}_vehicle"/>
-                <var name="vehicle.prefix" 
-                     value="${vehicle.name}_@{vehicle}"/>
-                
-                <echo message="Building @{vehicle} vehicle" />
-                
-                <!-- Compile common and vehicle specific classes-->
-                <ts.javac includes="${vehicle.pkg.dir}/@{vehicle}/*.java,
-                                    ${vehicle.pkg.dir}/*.java"/>
-                
-                <!-- Filter default vehicle deployment descriptor in case it's needed-->
-                <_filter.default.vehicle.descriptors 
-                        vehicle="@{vehicle}"
-                        testname="@{name}"/>
-                                    
-              <!-- *******************************
-                     EJB
-                   ******************************* -->
-                <if>
-                    <equals arg1="@{vehicle}" arg2="ejb"/>
-                <then>
-                    <ts.ejbjar descriptor="${vehicle.prefix}.xml"
-                               descriptordir="${descriptor.dir}" 
-                               archivename="@{name}_${vehicle.name}"
-                               includedefaultfiles="@{includedefaultfiles}"
-                               manifest="@{manifest}"
-                               excludedfiles="@{excludedfiles}">
-                        <fileset dir="${class.dir}"
-                             includes="${test.base.classes},
-                                       ${harness.pkg.dir}/ServiceEETest*.class,
-                                       ${vehicle.pkg.dir}/@{vehicle}/*.class,
-                                       ${vehicle.pkg.dir}/*.class,
-                                       ${pkg.dir}/**/*.class, @{classes}"
-                             excludes="${runner.classes}, @{excludedfiles}"/>
-                        <ejb-elements/>
-                        <jar-elements/>
-                    </ts.ejbjar>       
-                    
-                    <var name="vehicle.prefix" value="${vehicle.name}_client"/>
-                    
-                    <ts.clientjar descriptor="${vehicle.prefix}.xml"
-                                  descriptordir="${descriptor.dir}" 
-                                  archivename="@{name}_${vehicle.name}"
-                                  mainclass="com.sun.ts.tests.common.vehicle.VehicleClient"
-                                  includedefaultfiles="false"
-                                  excludedfiles="@{excludedfiles}">
-                        <fileset dir="${class.dir}"
-                                 includes="${vehicle.pkg.dir}/@{vehicle}/*.class,
-                                           ${vehicle.pkg.dir}/*.class,
-                                           ${harness.pkg.dir}/ServiceEETest*.class"
-                                 excludes="@{excludedfiles},
-                                           ${vehicle.pkg.dir}/@{vehicle}/EJBVehicle.class"/>
-                        
-                    </ts.clientjar>   
-                </then>
-               <!-- *******************************
-                     APPLICATION CLIENT
-                    ******************************* -->
-                <elseif>
-                    <equals arg1="@{vehicle}" arg2="appclient"/>
-                <then>
-                    <var name="vehicle.prefix" value="${vehicle.name}_client"/>
-                    
-                    <ts.clientjar descriptor="${vehicle.prefix}.xml"
-                                  descriptordir="${descriptor.dir}" 
-                                  archivename="@{name}_${vehicle.name}"
-                                  mainclass="com.sun.ts.tests.common.vehicle.VehicleClient"
-                                  includedefaultfiles="@{includedefaultfiles}"
-                                  manifest="@{manifest}"
-                                  excludedfiles="@{excludedfiles}">
-                        <fileset dir="${class.dir}"
-                                 includes="${vehicle.pkg.dir}/@{vehicle}/*.class,
-                                           ${pkg.dir}/**/*.class,
-                                           ${vehicle.pkg.dir}/*.class, @{classes},
-                                           ${harness.pkg.dir}/ServiceEETest*.class"
-                                 excludes="@{excludedfiles}"/>
-                        <client-elements/>
-                        <jar-elements/>
-                    </ts.clientjar>
-                </then>
-                </elseif>
-                <!-- *******************************
-                     WEB SERVICES APPLICATION CLIENT
-                     ******************************* -->
-                <elseif>
-                    <equals arg1="@{vehicle}" arg2="wsappclient"/>
-                <then>
-                    <var name="vehicle.prefix" value="${vehicle.name}_client"/>
-                    
-                    <ts.clientjar descriptor="${vehicle.prefix}.xml"
-                                  descriptordir="${descriptor.dir}" 
-                                  archivename="@{name}_${vehicle.name}"
-                                  mainclass="com.sun.ts.tests.common.vehicle.wsappclient.WSAppclient"
-                                  includedefaultfiles="@{includedefaultfiles}"
-                                  manifest="@{manifest}"
-                                  excludedfiles="@{excludedfiles}">
-                        <fileset dir="${class.dir}"
-                                 includes="${vehicle.pkg.dir}/@{vehicle}/*.class,
-                                           ${vehicle.pkg.dir}/@{vehicle}/handler.xml,
-                                           ${vehicle.pkg.dir}/*.class, 
-                                           @{classes},
-                                           ${harness.pkg.dir}/ServiceEETest*.class"
-                                 excludes="@{excludedfiles}"/>
-                        <client-elements/>
-                        <jar-elements/>
-                    </ts.clientjar>
-                </then>
-                </elseif>
-              <!-- *******************************
-                     SERVLET
-                   ******************************* -->
-                <elseif>
-                    <equals arg1="@{vehicle}" arg2="servlet"/>
-                <then>
-                    <var name="vehicle.prefix" value="${vehicle.name}_web"/>
-                    
-                    <!-- Compile common web vehicle classes-->
-                    <ts.javac includes="${vehicle.pkg.dir}/web/*.java"/>
-
-                    <ts.war descriptor="${vehicle.prefix}.xml"
-                            descriptordir="${descriptor.dir}" 
-                            archivename="@{name}_${vehicle.name}"
-                            includedefaultfiles="@{includedefaultfiles}"
-                            manifest="@{manifest}"
-                            excludedfiles="@{excludedfiles}">
-                        <zipfileset dir="${class.dir}"
-                                    includes="${test.base.classes},
-                                              ${pkg.dir}/**/*.class,
-                                              ${vehicle.pkg.dir}/*.class,
-                                              ${vehicle.pkg.dir}/@{vehicle}/*.class,
-                                              @{classes},
-                                              ${harness.pkg.dir}/ServiceEETest*.class"
-                                    excludes="${runner.classes}, @{excludedfiles}"
-                                    prefix="WEB-INF/classes"/>
-                        <servlet-elements/>
-                        <jar-elements/>
-                    </ts.war>
-                </then>
-                </elseif>
-              <!-- *******************************
-                     JSP
-                   ******************************* -->
-                <elseif>
-                    <equals arg1="@{vehicle}" arg2="jsp"/>
-                <then>
-                    <var name="vehicle.prefix" value="${vehicle.name}_web"/>
-                    
-                    <!-- Compile common web vehicle classes-->
-                    <ts.javac includes="${vehicle.pkg.dir}/web/*.java"/>
-  
-                    <ts.war descriptor="${vehicle.prefix}.xml"
-                            descriptordir="${descriptor.dir}" 
-                            archivename="@{name}_${vehicle.name}"
-                            includedefaultfiles="@{includedefaultfiles}"
-                            manifest="@{manifest}"
-                            excludedfiles="@{excludedfiles}">
-                        <zipfileset dir="${class.dir}"
-                                    includes="${test.base.classes},
-                                              ${pkg.dir}/**/*.class,
-                                              ${vehicle.pkg.dir}/*.class, 
-                                              ${vehicle.pkg.dir}/@{vehicle}/*.class, 
-                                              @{classes},
-                                              ${harness.pkg.dir}/ServiceEETest*.class"
-                                    excludes="${runner.classes}, @{excludedfiles}"
-                                    prefix="WEB-INF/classes"/>
-                        <fileset dir="${src.dir}/${vehicle.pkg.dir}/@{vehicle}/contentRoot"
-                                    includes="**"/>
-                        <jsp-elements/>
-                        <jar-elements/>
-                    </ts.war>
-                </then>
-                </elseif>
-
-                <!-- *******************************
-                     ejbembed
-                   ******************************* -->
-                <elseif>
-                    <equals arg1="@{vehicle}" arg2="ejbembed"/>
-                <then>
-                    <ts.ejbjar archivename="${vehicle.name}" descriptor="ejb-jar.xml" includedefaultfiles="false">
-                        <fileset dir="${class.dir}"
-                                 includes="${test.base.classes},
-                                           ${pkg.dir}/**/*.class,
-                                           ${vehicle.pkg.dir}/*.class, 
-                                           ${vehicle.pkg.dir}/@{vehicle}/*.class, 
-                                           ${vehicle.pkg.dir}/ejbliteshare/*.class, 
-                                           @{classes},
-                                           com/sun/ts/tests/ejb30/common/lite/*.class,
-                                           com/sun/ts/tests/ejb30/common/helper/Helper.class,
-                                           ${harness.pkg.dir}/ServiceEETest*.class"
-                                 excludes="@{excludedfiles}"/>
-                    </ts.ejbjar>
-                </then>
-                </elseif>
-                
-                <!-- *******************************
-                     ejblitejsf
-                   ******************************* -->
-                <elseif>
-                    <equals arg1="@{vehicle}" arg2="ejblitejsf"/>
-                <then>
-                    <var name="vehicle.prefix" value="${vehicle.name}_web"/>
-
-                    <copy todir="${dist.dir}/${pkg.dir}">
-                        <fileset dir="${src.dir}/${vehicle.pkg.dir}/@{vehicle}" includes="faces-config.xml,beans.xml"/>
-                        <filterset>
-                            <filter token="package" value="${package}"/>
-                        </filterset>
-                    </copy> 
-
-                    <ts.war descriptor="${vehicle.prefix}.xml"
-                            descriptordir="${descriptor.dir}" 
-                            archivename="@{name}_${vehicle.name}"
-                            includedefaultfiles="false"
-                            manifest="@{manifest}"
-                            excludedfiles="@{excludedfiles}">
-                        <zipfileset dir="${class.dir}"
-                                    includes="${test.base.classes},
-                                              ${pkg.dir}/**/*.class,
-                                              ${vehicle.pkg.dir}/*.class, 
-                                              ${vehicle.pkg.dir}/@{vehicle}/*.class, 
-                                              ${vehicle.pkg.dir}/ejbliteshare/*.class, 
-                                              @{classes},
-                                              com/sun/ts/tests/ejb30/common/lite/*.class,
-                                              com/sun/ts/tests/ejb30/common/helper/Helper.class,
-                                              ${harness.pkg.dir}/ServiceEETest*.class"
-                                    excludes="${runner.classes}, @{excludedfiles}"
-                                    prefix="WEB-INF/classes"/>
-                        <zipfileset dir="${basedir}" includes="ejb-jar.xml, beans.xml" prefix="WEB-INF"/>
-                        <zipfileset dir="${dist.dir}/${pkg.dir}" includes="faces-config.xml,beans.xml" prefix="WEB-INF"/>
-                        <zipfileset dir="${dist.dir}/${pkg.dir}" includes="*.jar" prefix="WEB-INF/lib" excludes="ejbembed_vehicle*.jar"/>
-                        <zipfileset dir="${basedir}" includes="*.tld" prefix="WEB-INF/tlds"/>
-                        <fileset dir="${src.dir}/${vehicle.pkg.dir}/@{vehicle}" includes="*.xhtml"/>
-                        <jsp-elements/>
-                        <jar-elements/>
-                    </ts.war>
-                    <delete failonerror="false">
-                        <fileset dir="${dist.dir}/${pkg.dir}" includes="faces-config.xml,beans.xml"/>
-                    </delete>
-                </then>
-                </elseif>
-                
-                <!-- *******************************
-                     ejblitejsp
-                   ******************************* -->
-                <elseif>
-                    <equals arg1="@{vehicle}" arg2="ejblitejsp"/>
-                <then>
-                    <var name="vehicle.prefix" value="${vehicle.name}_web"/>
-
-                    <ts.javac includes="${vehicle.pkg.dir}/ejbliteshare/*.java"/>
-
-                    <copy todir="${dist.dir}/${pkg.dir}">
-                        <fileset dir="${src.dir}/${vehicle.pkg.dir}/@{vehicle}" includes="ejblitejsp.tld"/>
-                        <filterset>
-                            <filter token="package" value="${package}"/>
-                        </filterset>
-                    </copy> 
-                    <copy tofile="${class.dir}/${pkg.dir}/EJBLiteJSPTag.java">
-                        <fileset dir="${src.dir}/${vehicle.pkg.dir}/@{vehicle}" includes="EJBLiteJSPTag.java.txt"/>
-                        <filterset>
-                            <filter token="package" value="${package}"/>
-                        </filterset>
-                    </copy>
-                    <ts.javac srcdir="${class.dir}" fork="false"
-                              includes="${pkg.dir}/EJBLiteJSPTag.java"/>
-
-                    <ts.war descriptor="${vehicle.prefix}.xml"
-                            descriptordir="${descriptor.dir}" 
-                            archivename="@{name}_${vehicle.name}"
-                            includedefaultfiles="false"
-                            manifest="@{manifest}"
-                            excludedfiles="@{excludedfiles}">
-                        <zipfileset dir="${class.dir}"
-                                    includes="${test.base.classes},
-                                              ${pkg.dir}/**/*.class,
-                                              ${vehicle.pkg.dir}/*.class, 
-                                              ${vehicle.pkg.dir}/@{vehicle}/*.class, 
-                                              ${vehicle.pkg.dir}/ejbliteshare/*.class, 
-                                              @{classes},
-                                              com/sun/ts/tests/ejb30/common/lite/*.class,
-                                              com/sun/ts/tests/ejb30/common/helper/Helper.class,
-                                              ${harness.pkg.dir}/ServiceEETest*.class"
-                                    excludes="${runner.classes}, @{excludedfiles}"
-                                    prefix="WEB-INF/classes"/>
-                        <zipfileset dir="${basedir}" includes="ejb-jar.xml, beans.xml" prefix="WEB-INF"/>
-                        <zipfileset dir="${dist.dir}/${pkg.dir}" includes="ejblitejsp.tld" prefix="WEB-INF/tlds"/>
-                        <zipfileset dir="${dist.dir}/${pkg.dir}" includes="*.jar" prefix="WEB-INF/lib" excludes="ejbembed_vehicle*.jar"/>
-                        <fileset dir="${src.dir}/${vehicle.pkg.dir}/@{vehicle}" includes="*.jsp"/>
-                        <jsp-elements/>
-                        <jar-elements/>
-                    </ts.war>
-                    <delete failonerror="false">
-                        <fileset dir="${dist.dir}/${pkg.dir}" includes="ejblitejsp.tld"/>
-                        <fileset dir="${class.dir}/${pkg.dir}" includes="EJBLiteJSPTag.*"/>
-                    </delete>
-                </then>
-                </elseif>
-
-
-                <!-- *******************************
-                     ejblitesecuredjsp
-                   ******************************* -->
-                <elseif>
-                    <equals arg1="@{vehicle}" arg2="ejblitesecuredjsp"/>
-                <then>
-                    <var name="vehicle.prefix" value="${vehicle.name}_web"/>
-
-                    <ts.javac includes="${vehicle.pkg.dir}/ejbliteshare/*.java"/>
-
-                    <copy todir="${dist.dir}/${pkg.dir}">
-                        <fileset dir="${src.dir}/${vehicle.pkg.dir}/@{vehicle}" includes="ejblitesecuredjsp.tld"/>
-                        <filterset>
-                            <filter token="package" value="${package}"/>
-                        </filterset>
-                    </copy> 
-                    <copy tofile="${class.dir}/${pkg.dir}/EJBLiteSecuredJSPTag.java">
-                        <fileset dir="${src.dir}/${vehicle.pkg.dir}/@{vehicle}" includes="EJBLiteSecuredJSPTag.java.txt"/>
-                        <filterset>
-                            <filter token="package" value="${package}"/>
-                        </filterset>
-                    </copy>
-                    <ts.javac srcdir="${class.dir}" fork="false"
-                              includes="${pkg.dir}/EJBLiteSecuredJSPTag.java"/>
-                    
-                    <ts.war descriptor="${vehicle.prefix}.xml"
-                            descriptordir="${descriptor.dir}" 
-                            archivename="@{name}_${vehicle.name}"
-                            includedefaultfiles="false"
-                            manifest="@{manifest}"
-                            excludedfiles="@{excludedfiles}">
-                        <zipfileset dir="${class.dir}"
-                                    includes="${test.base.classes},
-                                              ${pkg.dir}/**/*.class,
-                                              ${vehicle.pkg.dir}/*.class, 
-                                              ${vehicle.pkg.dir}/@{vehicle}/*.class, 
-                                              ${vehicle.pkg.dir}/ejbliteshare/*.class, 
-                                              @{classes},
-                                              com/sun/ts/tests/ejb30/common/lite/*.class,
-                                              com/sun/ts/tests/ejb30/common/helper/Helper.class,
-                                              ${harness.pkg.dir}/ServiceEETest*.class"
-                                    excludes="${runner.classes}, @{excludedfiles}"
-                                    prefix="WEB-INF/classes"/>
-                        <zipfileset dir="${basedir}" includes="ejb-jar.xml, beans.xml" prefix="WEB-INF"/>
-                        <zipfileset dir="${dist.dir}/${pkg.dir}" includes="ejblitesecuredjsp.tld" prefix="WEB-INF/tlds"/>
-                        <zipfileset dir="${dist.dir}/${pkg.dir}" includes="*.jar" prefix="WEB-INF/lib" excludes="ejbembed_vehicle*.jar"/>
-                        <fileset dir="${src.dir}/${vehicle.pkg.dir}/@{vehicle}" includes="*.jsp"/>
-                        <jsp-elements/>
-                        <jar-elements/>
-                    </ts.war>
-                    <delete failonerror="false">
-                        <fileset dir="${dist.dir}/${pkg.dir}" includes="ejblitesecuredjsp.tld"/>
-                        <fileset dir="${class.dir}/${pkg.dir}" includes="EJBLiteSecuredJSPTag.*"/>
-                    </delete>
-                </then>
-                </elseif>
-                
-                
-                <!-- *******************************
-                     ejbliteservlet2
-                   ******************************* -->
-                <elseif>
-                    <equals arg1="@{vehicle}" arg2="ejbliteservlet2"/>
-                <then>
-                    <var name="vehicle.prefix" value="${vehicle.name}_web"/>
-
-                    <!-- If exists custom web.xml, it has been copied to ts.home/tmp.
-                    Otherwise, filter-copy it from vehicle dir to ts.home/tmp
-                    -->
-                    <if><not><available file="${basedir}/ejbliteservlet2_vehicle_web.xml"/></not>
-                    <then>
-                        <copy todir="${ts.home}/tmp" overwrite="true" failonerror="true">
-                            <fileset dir="${src.dir}/${vehicle.pkg.dir}/@{vehicle}" 
-                                includes="ejbliteservlet2_vehicle_web.xml"/>
-                            <filterset>
-                                <filter token="package" value="${package}"/>
-                            </filterset>
-                        </copy>
-                    </then></if>
-                    
-                    <copy tofile="${class.dir}/${pkg.dir}/EJBLiteServlet2Filter.java">
-                        <fileset dir="${src.dir}/${vehicle.pkg.dir}/@{vehicle}" includes="EJBLiteServlet2Filter.java.txt"/>
-                        <filterset>
-                            <filter token="package" value="${package}"/>
-                        </filterset>
-                    </copy>
-                    <ts.javac srcdir="${class.dir}" fork="false"
-                              includes="${pkg.dir}/EJBLiteServlet2Filter.java"/>
-
-                    <ts.javac includes="${vehicle.pkg.dir}/ejbliteshare/*.java"/>
-
-                    <ts.war descriptor="${vehicle.prefix}.xml"
-                            descriptordir="${descriptor.dir}"
-                            archivename="@{name}_${vehicle.name}"
-                            includedefaultfiles="false"
-                            manifest="@{manifest}"
-                            excludedfiles="@{excludedfiles}">
-                        <zipfileset dir="${class.dir}"
-                                    includes="${test.base.classes},
-                                              ${pkg.dir}/**/*.class,
-                                              ${vehicle.pkg.dir}/*.class, 
-                                              ${vehicle.pkg.dir}/@{vehicle}/*.class, 
-                                              ${vehicle.pkg.dir}/ejbliteshare/*.class, 
-                                              @{classes},
-                                              com/sun/ts/tests/ejb30/common/lite/*.class,
-                                              com/sun/ts/tests/ejb30/common/helper/Helper.class,
-                                              ${harness.pkg.dir}/ServiceEETest*.class"
-                                    excludes="${runner.classes}, @{excludedfiles}"
-                                    prefix="WEB-INF/classes"/>
-                        <zipfileset dir="${basedir}" includes="ejb-jar.xml, beans.xml" prefix="WEB-INF"/>
-                        <zipfileset dir="${dist.dir}/${pkg.dir}" includes="*.jar" prefix="WEB-INF/lib" excludes="ejbembed_vehicle*.jar"/>
-                        <fileset dir="${src.dir}/${vehicle.pkg.dir}/@{vehicle}" includes="*.jsp"/>
-                    </ts.war>
-                    <delete failonerror="false">
-                        <fileset dir="${class.dir}/${pkg.dir}" includes="EJBLiteServlet2Filter.*"/>
-                    </delete>
-                </then>
-                </elseif>
-		
-		<!-- *******************************
-                     ejbliteservletcal
-                   ******************************* -->
-                <elseif>
-                    <equals arg1="@{vehicle}" arg2="ejbliteservletcal"/>
-                <then>
-                    <var name="vehicle.prefix" value="${vehicle.name}_web"/>
-
-                    <!-- If exists custom web.xml, it has been copied to ts.home/tmp.
-                    Otherwise, filter-copy it from vehicle dir to ts.home/tmp
-                    -->
-                    <if><not><available file="${basedir}/ejbliteservletcal_vehicle_web.xml"/></not>
-                    <then>
-                        <copy todir="${ts.home}/tmp" overwrite="true" failonerror="true">
-                            <fileset dir="${src.dir}/${vehicle.pkg.dir}/@{vehicle}" 
-                                includes="ejbliteservletcal_vehicle_web.xml"/>
-                            <filterset>
-                                <filter token="package" value="${package}"/>
-                            </filterset>
-                        </copy>
-                    </then></if>
-                    
-                    <copy tofile="${class.dir}/${pkg.dir}/EJBLiteServletContextAttributeListener.java">
-                        <fileset dir="${src.dir}/${vehicle.pkg.dir}/@{vehicle}" includes="EJBLiteServletContextAttributeListener.java.txt"/>
-                        <filterset>
-                            <filter token="package" value="${package}"/>
-                        </filterset>
-                    </copy>
-                    <ts.javac srcdir="${class.dir}" fork="false"
-                              includes="${pkg.dir}/EJBLiteServletContextAttributeListener.java"/>
-                              
-                    <ts.javac includes="${vehicle.pkg.dir}/ejbliteshare/*.java"/>
-
-                    <ts.war descriptor="${vehicle.prefix}.xml"
-                            descriptordir="${descriptor.dir}"
-                            archivename="@{name}_${vehicle.name}"
-                            includedefaultfiles="false"
-                            manifest="@{manifest}"
-                            excludedfiles="@{excludedfiles}">
-                        <zipfileset dir="${class.dir}"
-                                    includes="${test.base.classes},
-                                              ${pkg.dir}/**/*.class,
-                                              ${vehicle.pkg.dir}/*.class, 
-                                              ${vehicle.pkg.dir}/@{vehicle}/*.class, 
-                                              ${vehicle.pkg.dir}/ejbliteshare/*.class, 
-                                              @{classes},
-                                              com/sun/ts/tests/ejb30/common/lite/*.class,
-                                              com/sun/ts/tests/ejb30/common/helper/Helper.class,
-                                              ${harness.pkg.dir}/ServiceEETest*.class"
-                                    excludes="${runner.classes}, @{excludedfiles}"
-                                    prefix="WEB-INF/classes"/>
-                        <zipfileset dir="${basedir}" includes="ejb-jar.xml, beans.xml" prefix="WEB-INF"/>
-                        <zipfileset dir="${dist.dir}/${pkg.dir}" includes="*.jar" prefix="WEB-INF/lib"/>
-                        <fileset dir="${src.dir}/${vehicle.pkg.dir}/@{vehicle}" includes="*.jsp"/>
-                    </ts.war>
-                    <delete failonerror="false">
-                        <fileset dir="${class.dir}/${pkg.dir}" includes="EJBLiteServletContextAttributeListener.*"/>
-                    </delete>
-                </then>
-                </elseif>
-		
-                <!-- *******************************
-                     ejbliteservlet
-                   ******************************* -->
-                <elseif>
-                    <equals arg1="@{vehicle}" arg2="ejbliteservlet"/>
-                <then>
-                    <var name="vehicle.prefix" value="${vehicle.name}_web"/>
-
-                    <!-- If exists custom web.xml, it has been copied to ts.home/tmp.
-                    Otherwise, filter-copy it from vehicle dir to ts.home/tmp
-                    -->
-                    <if><not><available file="${basedir}/ejbliteservlet_vehicle_web.xml"/></not>
-                    <then>
-                        <copy todir="${ts.home}/tmp" overwrite="true" failonerror="true">
-                            <fileset dir="${src.dir}/${vehicle.pkg.dir}/@{vehicle}" 
-                                includes="ejbliteservlet_vehicle_web.xml"/>
-                            <filterset>
-                                <filter token="package" value="${package}"/>
-                            </filterset>
-                        </copy>
-                    </then></if>
-                    
-                    <copy tofile="${class.dir}/${pkg.dir}/EJBLiteServletVehicle.java">
-                        <fileset dir="${src.dir}/${vehicle.pkg.dir}/@{vehicle}" includes="EJBLiteServletVehicle.java.txt"/>
-                        <filterset>
-                            <filter token="package" value="${package}"/>
-                        </filterset>
-                    </copy>
-                    <copy tofile="${class.dir}/${pkg.dir}/HttpServletDelegate.java">
-                              <fileset dir="${src.dir}/${vehicle.pkg.dir}/@{vehicle}" includes="HttpServletDelegate.java.txt"/>
-                              <filterset>
-                                  <filter token="package" value="${package}"/>
-                              </filterset>
-                    </copy>
-                    <ts.javac srcdir="${class.dir}" fork="false"
-                              includes="${pkg.dir}/EJBLiteServletVehicle.java,
-                    					${pkg.dir}/HttpServletDelegate.java"/>
-
-                    <ts.javac includes="${vehicle.pkg.dir}/ejbliteshare/*.java"/>
-
-                    <ts.war descriptor="${vehicle.prefix}.xml"
-                            descriptordir="${descriptor.dir}"
-                            archivename="@{name}_${vehicle.name}"
-                            includedefaultfiles="false"
-                            manifest="@{manifest}"
-                            excludedfiles="@{excludedfiles}">
-                        <zipfileset dir="${class.dir}"
-                                    includes="${test.base.classes},
-                                              ${pkg.dir}/**/*.class,
-                                              ${vehicle.pkg.dir}/*.class, 
-                                              ${vehicle.pkg.dir}/@{vehicle}/*.class, 
-                                              ${vehicle.pkg.dir}/ejbliteshare/*.class, 
-                                              @{classes},
-                                              com/sun/ts/tests/ejb30/common/lite/*.class,
-                                              com/sun/ts/tests/ejb30/common/helper/Helper.class,
-                                              ${harness.pkg.dir}/ServiceEETest*.class"
-                                    excludes="${runner.classes}, @{excludedfiles}"
-                                    prefix="WEB-INF/classes"/>
-                        <zipfileset dir="${basedir}" includes="ejb-jar.xml, beans.xml" prefix="WEB-INF"/>
-                        <zipfileset dir="${dist.dir}/${pkg.dir}" includes="*.jar" prefix="WEB-INF/lib" excludes="ejbembed_vehicle*.jar"/>
-                        <fileset dir="${src.dir}/${vehicle.pkg.dir}/@{vehicle}" includes="*.jsp"/>
-                    </ts.war>
-                    <delete failonerror="false">
-                        <fileset dir="${class.dir}/${pkg.dir}" includes="EJBLiteServletVehicle*"/>
-                    </delete>
-                </then>
-                </elseif>
-
-              <!-- ********************************
-                     WEB (Combined JSP and Servlet)
-                   ******************************** -->
-                <elseif>
-                    <equals arg1="@{vehicle}" arg2="web"/>
-                <then>
-                    <var name="vehicle.prefix" value="${vehicle.name}_web"/>
-                    
-                    <!-- Compile common web vehicle classes-->
-                    <ts.javac includes="${vehicle.pkg.dir}/web/*.java,
-                                        ${vehicle.pkg.dir}/servlet/*.java"/>
-
-                    <ts.war descriptor="${vehicle.prefix}.xml"
-                            descriptordir="${descriptor.dir}" 
-                            archivename="@{name}_${vehicle.name}"
-                            includedefaultfiles="@{includedefaultfiles}"
-                            manifest="@{manifest}"
-                            excludedfiles="@{excludedfiles}">
-                        <zipfileset dir="${class.dir}"
-                                    includes="${test.base.classes},
-                                              ${pkg.dir}/**/*.class,
-                                              ${vehicle.pkg.dir}/*.class, 
-                                              ${vehicle.pkg.dir}/@{vehicle}/*.class, 
-                                              ${vehicle.pkg.dir}/servlet/*.class,
-                                              @{classes},
-                                              ${harness.pkg.dir}/ServiceEETest*.class"
-                                    excludes="${runner.classes}, @{excludedfiles}"
-                                    prefix="WEB-INF/classes"/>
-                        <fileset dir="${src.dir}/${vehicle.pkg.dir}/jsp/contentRoot"
-                                    includes="**"/>
-                        <servlet-elements/>
-                        <jsp-elements/>
-                        <jar-elements/>
-                    </ts.war>
-                </then>
-                </elseif>
-              <!-- *******************************
-                     WS SERVLET
-                   ******************************* -->
-                <elseif>
-                    <equals arg1="@{vehicle}" arg2="wsservlet"/>
-                <then>
-
-                    <var name="vehicle.prefix" value="${vehicle.name}_web"/>
-                    
-                    <!-- Compile common web vehicle classes-->
-                    <ts.javac includes="${vehicle.pkg.dir}/web/*.java"/>
-
-                    <ts.war descriptor="${vehicle.prefix}.xml"
-                            descriptordir="${descriptor.dir}" 
-                            archivename="@{name}_${vehicle.name}"
-                            includedefaultfiles="@{includedefaultfiles}"
-                            manifest="@{manifest}"
-                            excludedfiles="@{excludedfiles}">
-                        <zipfileset dir="${class.dir}"
-                                    includes="${vehicle.pkg.dir}/@{vehicle}/*.class,
-                                              ${vehicle.pkg.dir}/*.class,
-                                              ${vehicle.pkg.dir}/@{vehicle}/handler.xml,
-                                              ${test.base.classes}
-                                              ${jaxws.common.classes},
-                                              @{classes},
-                                              ${harness.pkg.dir}/ServiceEETest*.class"
-                                    excludes="${runner.classes}, @{excludedfiles}"
-                                    prefix="WEB-INF/classes"/>
-                        <zipfileset dir="${src.dir}/${pkg.dir}"
-                                    includes="${wsdl.xsd.files}"
-                                    prefix="WEB-INF/wsdl"/>
-                        <wsservlet-elements/>
-                        <jar-elements/>
-                    </ts.war>
-                </then>
-                </elseif>
-              <!-- *******************************
-                     WS EJB
-                   ******************************* -->
-                <elseif>
-                    <equals arg1="@{vehicle}" arg2="wsejb"/>
-                <then>
-                    
-                    <var name="vehicle.prefix" value="${vehicle.name}_ejb"/>
-                    <ts.ejbjar descriptor="${vehicle.prefix}.xml"
-                               descriptordir="${descriptor.dir}"
-                               archivename="@{name}_${vehicle.name}"
-                               includedefaultfiles="@{includedefaultfiles}"
-                               manifest="@{manifest}"
-                               excludedfiles="@{excludedfiles}">
-                        <fileset dir="${class.dir}"
-                             includes="${vehicle.pkg.dir}/@{vehicle}/*.class,
-                                       ${vehicle.pkg.dir}/*.class,
-                                       ${vehicle.pkg.dir}/@{vehicle}/handler.xml,
-                                       ${test.base.classes},
-                                       ${jaxws.common.classes},
-                                       @{classes},
-                                       ${harness.pkg.dir}/ServiceEETest*.class"
-                             excludes="${runner.classes}, @{excludedfiles}"/>
-                        <zipfileset dir="${src.dir}/${pkg.dir}"
-                                    includes="${wsdl.xsd.files}"
-                                    prefix="META-INF/wsdl"/>
-                        <wsejb-elements/>
-                        <jar-elements/>
-                    </ts.ejbjar>
-
-                    <var name="vehicle.prefix" value="${vehicle.name}_client"/>
-
-                    <ts.clientjar descriptor="${vehicle.prefix}.xml"
-                                  descriptordir="${descriptor.dir}"
-                                  archivename="@{name}_${vehicle.name}"
-                                  mainclass="com.sun.ts.tests.common.vehicle.VehicleClient"
-                                  includedefaultfiles="@{includedefaultfiles}"
-                                  excludedfiles="@{excludedfiles}">
-                        <fileset dir="${class.dir}"
-                                 includes="${vehicle.pkg.dir}/@{vehicle}/*.class,
-                                           ${vehicle.pkg.dir}/*.class,
-                                           ${vehicle.pkg.dir}/@{vehicle}/handler.xml,
-                                           @{classes},
-                                           ${jaxws.common.classes},
-                                           ${harness.pkg.dir}/ServiceEETest*.class"
-                                 excludes="@{excludedfiles},
-                                           ${vehicle.pkg.dir}/@{vehicle}/WSEJBVehicle.class"/>
-                        <wsejb-elements/>
-                        <jar-elements/>
-                    </ts.clientjar>
-                </then>
-                </elseif>
-              <!-- ***************************************
-                     STATELESS3
-                        a bean-managed stateless session bean
-                        bean using JNDI to lookup a 
-                        JTA EntityManager and uses
-                        UserTransaction methods for transaction
-                        demarcation
-
-                     STATEFUL3
-                        a container-managed stateful session
-                        bean using @PersistenceContext annotation
-                        to inject JTA EntityManager and uses
-                        container-managed transaction demarcation
-                        with transaction attribute: REQUIRED
-
-                    APPMANAGED
-                        a container-managed stateful session bean
-                        using @PersistenceUnit annotation to
-                        inject an EntityManagerFactory.  The EMF API
-                        is used to create an Application-Managed JTA
-                        EntityManager and uses the container to demarcate
-                        transactions
-
-                    APPMANAGEDNoTx
-                        a container-managed stateful session bean
-                        using @PersistenceUnit annotation to
-                        inject an EntityManagerFactory.  The EMF API
-                        is used to create an Application-Managed Resource
-                        Local EntityManager and uses the EntityTransaction
-                        APIs to control transactions
-
-                   *************************************** -->
-                <elseif>
-                  <or>
-                     <equals arg1="@{vehicle}" arg2="stateless3"/>
-                     <equals arg1="@{vehicle}" arg2="stateful3"/>
-                     <equals arg1="@{vehicle}" arg2="appmanaged"/>
-      		     <equals arg1="@{vehicle}" arg2="appmanagedNoTx"/>
-                  </or>
-                <then>
-                    
-                    <ts.ejbjar descriptor="${vehicle.prefix}.xml"
-                               descriptordir="${descriptor.dir}"
-                               archivename="@{name}_${vehicle.name}"
-                               includedefaultfiles="false"
-                               manifest="@{manifest}"
-                               excludedfiles="@{excludedfiles}">
-                        <fileset dir="${class.dir}"
-                             includes="${test.base.classes},
-                                       ${vehicle.pkg.dir}/@{vehicle}/*.class,
-                                       ${vehicle.pkg.dir}/*.class,
-                                       ${vehicle.pkg.dir}/ejb3share/*.class,
-                                       ${pkg.dir}/Client*.class,
-                                       com/sun/ts/tests/jpa/common/PMClientBase.class,
-                                       com/sun/ts/tests/jpa/common/helper/*.class,
-                                       ${harness.pkg.dir}/ServiceEETest*.class"
-                             excludes="${runner.classes}, @{excludedfiles}"/>
-                        <ejb-elements/>
-                        <jar-elements/>
-                    </ts.ejbjar>
-
-                    <var name="vehicle.prefix" value="${vehicle.name}_client"/>
-
-                   <ts.clientjar descriptor="${vehicle.prefix}.xml"
-                                  descriptordir="${descriptor.dir}"
-                                  archivename="@{name}_${vehicle.name}"
-                                  mainclass="com.sun.ts.tests.common.vehicle.VehicleClient"
-                                  includedefaultfiles="false"
-                                  excludedfiles="@{excludedfiles}">
-                        <fileset dir="${class.dir}"
-                                 includes="${vehicle.pkg.dir}/@{vehicle}/*.class, ${vehicle.pkg.dir}/*.class,
-                                           ${vehicle.pkg.dir}/ejb3share/*.class,
-                        	               com/sun/ts/tests/jpa/common/PMClientBase.class,
-                                           ${harness.pkg.dir}/ServiceEETest*.class"
-                                 excludes="@{excludedfiles},
-                                           ${vehicle.pkg.dir}/@{vehicle}/*Bean.class,
-                                           ${vehicle.pkg.dir}/ejb3share/*Bean.class"/>
-                        <jar-elements/>
-                   </ts.clientjar>
-
-                </then>
-                </elseif>
-              <!-- *******************************
-                     PMSERVLET
-
-		     Servlet which injects an EntityManager
-		     using the @PersistenceContext annotation
-   		     to inject JTA EntityManager and uses
-                     UserTransaction methods for transaction
-                     demarcation
-
-                     PUSERVLET
-
-                     Servlet which injects an EntityManagerFactory
-                     using the @PersistenceUnit annotation
-                     to inject Resource Local EntityManager and uses
-                     EntityTransaction APIs for transaction
-                     demarcation
-
-                   ******************************* -->
-                <elseif>
-                  <or>
-                    <equals arg1="@{vehicle}" arg2="pmservlet"/>
-                    <equals arg1="@{vehicle}" arg2="puservlet"/>
-                  </or>
-                <then>
-
-                    <var name="vehicle.prefix" value="${vehicle.name}_web"/>
-                    
-                    <!-- Compile common web vehicle classes-->
-                    <ts.javac includes="${vehicle.pkg.dir}/web/*.java"/>
-
-                    <ts.war descriptor="${vehicle.prefix}.xml"
-                            descriptordir="${descriptor.dir}"
-                            archivename="@{name}_${vehicle.name}"
-                            includedefaultfiles="false"
-                            manifest="@{manifest}"
-                            excludedfiles="@{excludedfiles}">
-                        <zipfileset dir="${class.dir}"
-			    includes="${test.base.classes},
-                            	${vehicle.pkg.dir}/@{vehicle}/*.class,
-                            	${vehicle.pkg.dir}/*.class,
-                            	${vehicle.pkg.dir}/servlet/ServletVehicle.class,
-			    	${vehicle.pkg.dir}/ejb3share/*.class,
-                                ${harness.pkg.dir}/ServiceEETest*.class
-                            	${pkg.dir}/Client*.class,
-                                com/sun/ts/tests/jpa/common/PMClientBase.class,
-                                com/sun/ts/tests/jpa/common/helper/*.class"
-                            excludes="${runner.classes}, @{excludedfiles}"
-                            prefix="WEB-INF/classes"/>
-                        <zipfileset dir="${dist.dir}/${pkg.dir}" includes="@{name}.jar" prefix="WEB-INF/lib"/>
-                       <servlet-elements/>
-                    </ts.war>
-                </then>
-                </elseif>
-
-              <!-- *******************************
-                     CONNECTOR SERVLET
-                   ******************************* -->
-                <elseif>
-                    <equals arg1="@{vehicle}" arg2="connectorservlet"/>
-                <then>
-                    <var name="vehicle.prefix" value="${vehicle.name}_web"/>
-                    <var name="connectorservletdd" value="servlet_vehicle_web.xml"/>
-                    
-                    <echo message="Inside the connector servlet vehicle part of ts.vehicles" />
-                    <echo message="vehicle.name = ${vehicle.name}" />
-                    <echo message="vehicle.prefix = ${vehicle.prefix}" />
-                    <echo message="name = @{name}" />
-                    <echo message="connectorservletdd = ${connectorservletdd}" />
-
-                    <!-- Compile common web vehicle classes-->
-                    <ts.javac includes="${vehicle.pkg.dir}/connectorservlet/*.java"/>
-
-                    <!-- 
-                          the web.xml will come from the tests/common/vehicle/connectorservlet/connectorservlet_vehicle_web.xml
-                     -->
-                    <ts.war descriptor="${vehicle.prefix}.xml"
-                            descriptordir="${descriptor.dir}" 
-                            archivename="@{name}_${vehicle.name}"
-                            includedefaultfiles="@{includedefaultfiles}"
-                            manifest="@{manifest}"
-                            excludedfiles="@{excludedfiles}">
-                        <zipfileset dir="${class.dir}"
-                                    includes="${test.base.classes},
-                                              ${pkg.dir}/**/*.class,
-                                              ${vehicle.pkg.dir}/*.class,
-                            	              ${vehicle.pkg.dir}/connectorservlet/*.class,
-                                              ${vehicle.pkg.dir}/@{vehicle}/*.class,
-                                              @{classes},
-                                              ${harness.pkg.dir}/ServiceEETest*.class"
-                                    excludes="${runner.classes}, @{excludedfiles}"
-                                    prefix="WEB-INF/classes"/>
-                        <servlet-elements/>
-                        <jar-elements/>
-                    </ts.war>
-
-
-                    <!-- copy the servlets xxx.sun-web.xml into the dist dir but give it a name that 
-                         matches the connectorservlet vehiclename.  In short, our connectorservlet vehilce
-                         is essentially a copy of the servlet vehicle.  It was down to present the venodr
-                         with a real example of how to create their own vendor specific vehicle if such 
-                         a need should arise.   -->
-                    <if> 
-                        <available file="${src.dir}/${pkg.dir}/@{name}_servlet_vehicle_web.war.sun-web.xml"/>
-                    <then>
-                        <echo message="Copying @{name}_servlet_vehicle_web.war.sun-web.xml to @{name}_connectorservlet_vehicle_web.war.sun-web.xml" />
-                        <copy file="${src.dir}/${pkg.dir}/@{name}_servlet_vehicle_web.war.sun-web.xml"
-                              toFile="${dist.dir}/${pkg.dir}/@{name}_connectorservlet_vehicle_web.war.sun-web.xml"
-                              overwrite="true"
-                              failonerror="false">
-                        </copy> 
-
-                    </then>
-                    </if>
-                </then>
-                </elseif>
-
-              <!-- *******************************
-                     Custom Vehicle 
-                   ******************************* -->
-                <elseif>
-                    <equals arg1="@{vehicle}" arg2="customvehicle"/>
-                <then>
-                    <var name="vehicle.prefix" value="${vehicle.name}_custom"/>
-
-                    <!-- Compile custom vehicle classes-->
-                    <ts.javac includes="${vehicle.pkg.dir}/customvehicle/*.java"/>
-
-                    <!-- 
-                         The use of this target should only be done on a 
-                         case by case basis as allowed by the TCK under test.
-                         This is should only be needed when there is a need
-                         to execute tests within a custom vehicle.
-                      -->
-
-                </then>
-                </elseif>
-
-
-              <!-- *******************************
-                     STAND ALONE
-                   ******************************* -->
-                <elseif>
-                    <equals arg1="@{vehicle}" arg2="standalone"/>
-                <then>
-                    <!--
-                         Do nothing for the standalone case except catch it.  We're doing this because
-                         people found the else message confusing, since they consider standalone a valid
-                         vehicle.
-                      -->
-                </then>
-                </elseif>
-                <else>
-                    <echo message="Invalid vehicle type: @{vehicle}" />
-                    <echo message="Defaulting to standalone vehicle" />
-                </else>
-                </if>
-
-                <!-- Only build the application archive (ear) if the build level is 3 -->
-                <if>
-                  <and>
-                    <equals arg1="@{buildleveloverride}" arg2="3"/>
-                    <not>
-                      <equals arg1="@{vehicle}" arg2="standalone"/>
-                    </not>
-                  </and>
-                <then>
-                    <!--
-                        Previously we were only passing in the names of the forward archives, which when
-                        they did not exist caused an empty fileset to be passed to ts.ear. The result was
-                        that all contents in the dist dir were being included in the ear file.
-                        We are now setting real.app.name to prepend vi_built to the archive name so that
-                        the vi_built archives will be passed to ts.ear instead of an empty list or just
-                        the forward archives. In the none vi_built case (default) the original name is used.
-                    -->
-                    <var name="real.app.name" unset="true"/>
-                    <if>
-                        <and>
-                            <istrue value="${rebuildable}"/>
-                            <istrue value="${build.vi}"/>
-                        </and>
-                    <then>
-                        <var name="real.app.name" value="${vi.build.string}_@{name}"/>
-                    </then>
-                    <else>
-                        <var name="real.app.name" value="@{name}"/>
-                    </else>
-                    </if>
-                    <if>
-                        <equals arg1="@{singleear}" arg2="true"/>
-                    <then>
-                        <ts.ear archivename="@{name}_vehicles"
-                                permissionsdescriptor="@{earpermissionsdescriptor}"
-                                permissionsdescriptordir="@{earpermissionsdescriptordir}"
-                                includedefaultfiles="false"
-                                update="true">
-                          <fileset dir="${dist.dir}/${pkg.dir}"
-                                   includes="${real.app.name}_${vehicle.name}*.jar,
-                                             ${real.app.name}_${vehicle.name}*.war,
-                                             ${real.app.name}_${vehicle.name}*.rar,
-                                             ${real.app.name}_${vehicle.name}*.par,
-                                             ${real.app.name}_${vehicle.name}*.car"/>
-                          <ear-elements/>
-                        </ts.ear>    
-                    </then>
-                    <else>
-                        <ts.ear archivename="@{name}_${vehicle.name}"
-                                permissionsdescriptor="@{earpermissionsdescriptor}"
-                                permissionsdescriptordir="@{earpermissionsdescriptordir}"
-                                deletecomponentarchives="false"
-                              includedefaultfiles="false">
-                          <fileset dir="${dist.dir}/${pkg.dir}"
-                                   includes="${real.app.name}_${vehicle.name}*.jar,
-                                             ${real.app.name}_${vehicle.name}*.war,
-                                             ${real.app.name}_${vehicle.name}*.rar,
-                                             ${real.app.name}_${vehicle.name}*.par,
-                                             ${real.app.name}_${vehicle.name}*.car"/>
-                          <ear-elements/>
-                        </ts.ear>
-                    </else>
-                    </if>
-                </then>
-                </if>
-                
-                <_copy.vehicle.runtime.files singleear="@{singleear}"
-                                                     vehicle="@{vehicle}"
-                                                     vehiclename="${vehicle.name}"
-                                                     testname="@{name}"/>
-                                            
-            </sequential>
-            </for>
-            
-            <!--
-            <if>
-                <equals arg1="@{buildleveloverride}" arg2="3"/>
-                <then>
-                    <_delete.component.archives/>
-                </then>
-            </if>
-            -->
-        </then>
-        </if>
-        </sequential>
-    </macrodef>
-                                    
-
-
-    <macrodef name="_filter.default.vehicle.descriptors">
-
-    <!--
-      The _filter.default.vehicle.descriptor task copies and filters a single 
-      vehicle's default standard deployment descriptors and copies them to the
-      ${ts.home}/tmp directory.  Users should not invoke this task directly.  
-      This task is used by the ts.vehicles task.
-    -->
-
-        <attribute name="vehicle"    
-                   description="Vehicle being processed"/>
-        <attribute name="testname"    
-                   description="Test name unique to this test dir"/>
-                              
-        <sequential>
-
-        <if> 
-          <not>
-            <available file="${ts.home}/tmp"/>
-          </not>
-        <then>
-          <mkdir dir="${ts.home}/tmp"/>
-        </then>
-        </if>
-        
-        <delete>
-            <fileset dir="${ts.home}/tmp" includes="*@{vehicle}_vehicle*.xml"
-                                          excludes="*sun-*"/>
-        </delete>
-        
-        <copy toDir="${ts.home}/tmp"
-              overwrite="true"
-              failonerror="true">
-            <fileset dir="${vehicle.src.dir}/@{vehicle}"
-                 includes="*@{vehicle}_vehicle*.xml"
-                 excludes="*.sun*.xml"/>
-        </copy>
-        
-        <copy toDir="${ts.home}/tmp"
-              overwrite="true"
-              failonerror="true">
-            <fileset dir="${basedir}"
-                 includes="*@{vehicle}_vehicle*.xml"
-                 excludes="*.sun*.xml"/>
-        </copy>
-        
-        <!--filter all vehicle filters even though some are unique to certain vehicles-->
-        <replace dir="${ts.home}/tmp"
-                 includes="*@{vehicle}_vehicle*.xml">
-            <replacetoken><![CDATA[display-name>@{vehicle}]]></replacetoken>
-            <replacevalue><![CDATA[display-name>@{testname}_@{vehicle}]]></replacevalue>
-        </replace>
-        </sequential>
-    </macrodef>
-    
-    <macrodef name="_copy.vehicle.runtime.files">
-
-    <!--
-      The _copy.vehicle.runtime.files task copies and filters runtime deployment descriptors
-      from the test directory to the dist directory.  Users should not invoke this task 
-      directly.  This task is used by the ts.vehicles task.
-    -->
-
-        <attribute name="vehicle"    
-                   description="Vehicle being processed"/>
-        <attribute name="vehiclename"    
-                   default="@{vehicle}_vehicle"
-                   description="Vehicle name being processed, i.e ejb_vehicle"/>
-        <attribute name="testname"    
-                   description="Test name unique to this test dir"/>
-        <attribute name="singleear"
-                   default="false"
-                   description="If true, bundle all vehicle component archives into a single Java EE Ear file.  If false, a unique Ear will be used for each vehicle component archive.  The default is false"/>
- 
-        <sequential>
-
-        <if> 
-          <not>
-            <available file="${dist.dir}/${pkg.dir}"/>
-          </not>
-        <then>
-          <mkdir dir="${dist.dir}/${pkg.dir}"/>
-        </then>
-        </if>
-
-        <for param="runtimefile">
-            <fileset dir="${vehicle.src.dir}/@{vehicle}"
-                     includes="*@{vehiclename}*.sun*.xml"/>
-          <sequential>
-            
-          <propertyregex property="runtimefile.name"
-                         input="@{runtimefile}"
-                         regexp="com[\/|\\]sun[\/|\\]ts[\/|\\]tests[\/|\\]common[\/|\\]vehicle[\/|\\]@{vehicle}[\/|\\](.*)"
-                         select="\1"
-                         casesensitive="true"
-                         override="true"/>
-            
-            <if>
-                <and>
-                    <istrue value="${rebuildable}"/>
-                    <istrue value="${build.vi}"/>
-                </and>
-            <then>
-                <var name="tofile.name" value="${vi.build.string}_@{testname}_${runtimefile.name}"/>
-            </then>
-            <else>
-                <var name="tofile.name" value="@{testname}_${runtimefile.name}"/>
-            </else>
-            </if>
-            
-            <copy file="@{runtimefile}"
-                  toFile="${dist.dir}/${pkg.dir}/${tofile.name}"
-                  overwrite="false"
-                  failonerror="false">
-                </copy> 
-          </sequential>
-        </for>
-        
-        <!--filter all vehicle filters even though some are unique to certain vehicles-->
-        <replace dir="${dist.dir}/${pkg.dir}"
-                 includes="*@{vehiclename}*.sun*.xml">
-            <replacetoken><![CDATA[jndi-name>com_sun_ts_tests_common_vehicle]]></replacetoken>
-            <replacevalue><![CDATA[jndi-name>@{testname}_@{vehiclename}]]></replacevalue>
-        </replace>
-        
-        <replace dir="${dist.dir}/${pkg.dir}"
-                 includes="*@{vehiclename}*.sun*.xml">
-            <replacetoken><![CDATA[display-name>@{vehiclename}]]></replacetoken>
-            <replacevalue><![CDATA[display-name>@{testname}_@{vehiclename}]]></replacevalue>
-        </replace>
-        
-        <replace dir="${dist.dir}/${pkg.dir}"
-                 includes="*@{vehiclename}*.sun*.xml">
-            <replacetoken><![CDATA[context-root>@{vehiclename}]]></replacetoken>
-            <replacevalue><![CDATA[context-root>@{testname}_@{vehiclename}]]></replacevalue>
-        </replace>
-       <echo message="about to sweep vehicle runtime"/>
-        <replace dir="${dist.dir}/${pkg.dir}"
-                 includes="${vi.build.string}_*@{vehiclename}*.sun*.xml">
-            <replacetoken><![CDATA[web-uri>@{vehiclename}]]></replacetoken>
-            <replacevalue><![CDATA[web-uri>vi_built_@{testname}_@{vehiclename}]]></replacevalue>
-        </replace>
- 
-        <replace dir="${dist.dir}/${pkg.dir}"
-                 includes="*@{vehiclename}*.sun*.xml"
-                 excludes="${vi.build.string}_*">
-            <replacetoken><![CDATA[web-uri>@{vehiclename}]]></replacetoken>
-            <replacevalue><![CDATA[web-uri>@{testname}_@{vehiclename}]]></replacevalue>
-        </replace>
-        
-        </sequential>
-    </macrodef>
-    
-    <!-- PRESETS -->
-    
-</project>
diff --git a/bin/xml/ts.war.xml b/bin/xml/ts.war.xml
deleted file mode 100644
index d116aab252..0000000000
--- a/bin/xml/ts.war.xml
+++ /dev/null
@@ -1,184 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
-    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
-
--->
-
-<project name="WebImport" basedir="." default="usage">
-
-    <!-- IMPORTS -->
-    <import file="./ts.common.xml"/>
-
-    <!-- LOCAL PROPERTY DEFINITIONS -->  
-    
-    <!-- MACROS -->
-    <macrodef name="ts.war">
-
-
-    <!--
-        The ts.war task allows users to build web archives.  By default all classes
-        under TS_HOME/classes/<pkg.dir> are included in the generated archive.  Users
-        may specify additional content using nested fileset and zipfileset elements.
-        User may also tweak the contents of the generated archive by specifying various
-        attribute values, see the attribute and element tables for details.
-
-        Examples:
-
-        <ts.war archivename="example"
-               descriptor="example_web.xml"/>
-
-        This example builds a web archive named example_web.war.  The deployment
-        descriptor in the web archive, web.xml, is specified using the descriptor
-        attribute.  Note, the example_web.xml file ends up in the web archive as
-        the WEB-INF/web.xml with no diffs.  The classes added to the archive are the
-        default classes, TS_HOME/classes/<pkg.dir>/**/*.class.  Where <pkg.dir> is
-        the package name of the test being built.
-
- 
-        <ts.war archivename="example"
-                descriptor="example_web.xml">
-            <zipfileset dir="${class.dir}"
-                        includes="<common-classes-pkg-dir>/*.class"
-                        prefix="WEB-INF/classes"/>
-            <zipfileset dir="." includes="faces-config.xml"
-                        prefix="WEB-INF"/>
-            <zipfileset dir="." includes="*.jsp"/>
-            <zipfileset dir="${ts.home}/weblib"
-                        includes="*.jar"
-                        prefix="WEB-INF/lib"/>
-        </ts.war>      
-
-        This example is the same as the previous example except the user has opted to add
-        additional content in addition to the default classes.  The additional content is
-        specified using nested zipfileset elements.  In this example the developer has added
-        additional common classes to the WEB-INF/classes directory within the generated archive.
-        They have also added an XML configuration file (faces-config.xml) to the WEB-INF
-        directory of the archive.  All JSP files in the current directory have also been added 
-        to the root directory of the generated archive.  Finally, a set of library jars has been
-        added tp the WEB-INF directory of the generated archive.  Note, users may specify
-        additional content using nested fileset or zipfileset elements.
-
-     
-        <ts.war archivename="example"
-               descriptor="example_web.xml"
-               includedefaultfiles="false">
-            <zipfileset dir="${class.dir}"
-                        includes="<common-classes-pkg-dir>/*.class"
-                        prefix="WEB-INF/classes"/>
-            <zipfileset dir="." includes="faces-config.xml"
-                        prefix="WEB-INF"/>
-            <zipfileset dir="." includes="*.jsp"/>
-            <zipfileset dir="${ts.home}/weblib"
-                        includes="*.jar"
-                        prefix="WEB-INF/lib"/>
-        </ts.war>      
-
-        This example is the same as the previous example except the user has opted to add
-        additional content instead of the default classes.  The only difference between the examples
-        is the inclusion of the default classes, TS_HOME/classes/<pkg-dir/**/*.class.
-
-
-        <ts.war archivename="example"
-               descriptor="example_web.xml"
-               excludedfiles="${pkg.dir}/B*.class">
-        </ts.war>      
-
-        This example excludes all class files that start with "B" that live in the
-        TS_HOME/classes/${pkg.dir}.  If the TS_HOME/classes/${pkg.dir} contained the classes A.class,
-        B1.class, B2.class and C.class only classes A and C would end up in the archive.  Using the
-        excludedfiles attribute is another way of customizing the content of the archive by excluding
-        some of the default content.  Users can also use the includedefaultfiles attribute to exclude
-        all default content but the user must then use nested filesets and or zipfilesets to include
-        the appropriate content.  Using the excludedfiles attribute may be simpler in some cases.
-
-        To continue this example, the following XML does the exact same thing as the example above
-        but it uses the includedefaultfiles attribute and a nested zipfileset element.
-
-        <ts.war descriptor="example" 
-                archivename="example_web.xml"/>
-                includedefaultfiles="false">
-            <zipfileset dir="${class.dir}"
-                        includes="${pkg.dir}/A.class, ${pkg.dir}/C.class"
-                        prefix="WEB-INF/classes"/>
-        </ts.war>
-
-      -->
-
-        <attribute name="descriptor"
-                   default=""        
-                   description="Deployment descriptor added to the archive if the archive requires a deployment descriptor"/>
-
-        <attribute name="manifest"
-                   default=""
-                   description="Manifest to be used within the archive"/>
-        
-        <attribute name="archivename"   
-                   description="Archive name minus the file suffix"/>
-                   
-        <attribute name="descriptordir"
-                   default="${src.dir}/${pkg.dir}"
-                   description="Directory containing the deployment descriptor"/>           
-        
-        <attribute name="includedefaultfiles"
-                   default="true"
-                   description="Include default files in the component archive"/>
-        
-        <attribute name="excludedfiles"
-                   default=""
-                   description="A comma separated list of file expressions to exclude from the set of default included files.  This list of file expressions is relative to the TS_HOME/classes directory."/>
-
-        <element name="jar-elements" implicit="yes" optional="yes"
-                 description="The content to be added to the archive"/>
-        
-        <sequential>
-        
-        <!-- Define commmon preset regardless of includedefaultfiles value-->
-        <presetdef name="component.war">
-            <_component descriptor="@{descriptor}"
-                       manifest="@{manifest}"
-                       archivename="@{archivename}"
-                       archivesuffix="_web.war"
-                       descriptordir="@{descriptordir}"
-                       internaldescriptorname="WEB-INF/web.xml"
-                      >
-            </_component>
-        </presetdef>
-        
-        <if>
-          <istrue value="@{includedefaultfiles}"/>
-        <then>
-          <component.war>
-              <zipfileset dir="${class.dir}"
-                          includes="${pkg.dir}/**/*.class"
-                          excludes="${pkg.dir}/*lient*.class, @{excludedfiles}"
-                          prefix="WEB-INF/classes"/>
-              <jar-elements/>
-          </component.war>
-        </then>
-        <else>
-          <component.war>
-            <jar-elements/>
-          </component.war>
-        </else>
-        </if>
-        </sequential>
-    </macrodef>
-    
-    <!-- PRESETS -->
-
-    <!-- TARGETS -->
-
-</project>