diff --git a/jms/src/main/java/com/sun/ts/tests/jms/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/build.xml
deleted file mode 100644
index 460018e999..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/build.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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 basedir="." default="usage" name="jms">
-  <import file="../../../../../../bin/xml/ts.nonleafimport.xml" />
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/build.xml
deleted file mode 100644
index b392441c3a..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/build.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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 basedir="." default="usage" name="jms_core_appclient">
-  <import file="../../../../../../../../bin/xml/ts.nonleafimport.xml" />
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedQueueConnection/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedQueueConnection/build.xml
deleted file mode 100644
index 95dfc98502..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedQueueConnection/build.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_core_appclient_closedQueueConnection" basedir="." default="usage">
-<import file="../../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <target name="package">
-      <ts.vehicles name="closedQueueConnection"> 
-        <jar-elements>
-          <fileset dir="${class.dir}" 
-                   includes="com/sun/ts/tests/jms/common/JmsTool.class,
-                             com/sun/ts/tests/jms/common/MessageTestImpl.class"/>
-        </jar-elements>
-      </ts.vehicles>
-  </target>
-
-  <target name="compile">
-      <ts.javac includes="${pkg.dir}/**/*.java,
-                          com/sun/ts/tests/jms/common/**/*.java"/>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedQueueReceiver/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedQueueReceiver/build.xml
deleted file mode 100644
index 6d10985ff3..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedQueueReceiver/build.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_core_appclient_closedQueueReceiver" basedir="." default="usage">
-<import file="../../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <target name="package">
-      <ts.vehicles name="closedQueueReceiver"> 
-        <jar-elements>
-          <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"/>
-        </jar-elements>
-      </ts.vehicles>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedQueueSession/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedQueueSession/build.xml
deleted file mode 100644
index 8711a37eb8..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedQueueSession/build.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_core_appclient_closedQueueSession" basedir="." default="usage">
-<import file="../../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <target name="package">
-      <ts.vehicles name="closedQueueSession"> 
-        <jar-elements>
-          <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class,
-                                                com/sun/ts/tests/jms/common/MessageTestImpl.class,
-                                                com/sun/ts/tests/jms/common/TextMessageTestImpl.class,
-                                                com/sun/ts/tests/jms/common/BytesMessageTestImpl.class,
-                                                com/sun/ts/tests/jms/common/MapMessageTestImpl.class,
-                                                com/sun/ts/tests/jms/common/ObjectMessageTestImpl.class,
-                                                com/sun/ts/tests/jms/common/StreamMessageTestImpl.class"/>
-        </jar-elements>
-      </ts.vehicles>
-  </target>
-
-  <target name="compile">
-      <ts.javac includes="${pkg.dir}/**/*.java,
-                          com/sun/ts/tests/jms/common/**/*.java"/>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedTopicConnection/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedTopicConnection/build.xml
deleted file mode 100644
index 07f94b8a47..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedTopicConnection/build.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_core_appclient_closedTopicConnection" basedir="." default="usage">
-<import file="../../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <target name="package">
-      <ts.vehicles name="closedTopicConnection">
-        <jar-elements>
-          <fileset dir="${class.dir}"
-                   includes="com/sun/ts/tests/jms/common/JmsTool.class,
-                             com/sun/ts/tests/jms/common/MessageTestImpl.class"/>
-        </jar-elements>
-      </ts.vehicles>
-  </target>
-
-  <target name="compile">
-      <ts.javac includes="${pkg.dir}/**/*.java,
-                          com/sun/ts/tests/jms/common/**/*.java"/>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedTopicSession/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedTopicSession/build.xml
deleted file mode 100644
index 831d6999cf..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/closedTopicSession/build.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_core_appclient_closedTopicSession" basedir="." default="usage">
-<import file="../../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <target name="package">
-      <ts.vehicles name="closedTopicSession"> 
-        <jar-elements>
-          <fileset dir="${class.dir}" 
-                   includes="com/sun/ts/tests/jms/common/JmsTool.class,
-                             com/sun/ts/tests/jms/common/MessageTestImpl.class"/>
-        </jar-elements>
-      </ts.vehicles>
-  </target>
-
-  <target name="compile">
-      <ts.javac includes="${pkg.dir}/**/*.java,
-                          com/sun/ts/tests/jms/common/**/*.java"/>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/invalidDest/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/invalidDest/build.xml
deleted file mode 100644
index 60e9621dfd..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/invalidDest/build.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_core_appclient_invalidDest" basedir="." default="usage">
-<import file="../../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <target name="package">
-      <ts.vehicles name="invalidDest"> 
-        <jar-elements>
-          <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"/>
-        </jar-elements>
-      </ts.vehicles>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/queueconn/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/queueconn/build.xml
deleted file mode 100644
index 048c5a31cc..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/queueconn/build.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_core_appclient_queueconn" basedir="." default="usage">
-<import file="../../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <target name="package">
-      <ts.vehicles name="queueconn"> 
-        <jar-elements>
-          <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"/>
-        </jar-elements>
-      </ts.vehicles>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/queuetests/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/queuetests/build.xml
deleted file mode 100644
index 2fa15456f6..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/queuetests/build.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_core_appclient_queuetests" basedir="." default="usage">
-<import file="../../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <target name="package">
-      <ts.vehicles name="queuetests"> 
-        <jar-elements>
-          <fileset dir="${class.dir}"
-                   includes="com/sun/ts/tests/jms/common/JmsTool.class,
-                             com/sun/ts/tests/jms/common/DoneLatch.class,
-                             com/sun/ts/tests/jms/common/SerialTestMessageListenerImpl.class,
-                             com/sun/ts/tests/jms/common/SessionThread.class,
-                             com/sun/ts/tests/jms/common/TestMessageListener.class"/>
-        </jar-elements>
-      </ts.vehicles>
-  </target>
-
-  <target name="compile">
-      <ts.javac includes="${pkg.dir}/**/*.java,
-                          com/sun/ts/tests/jms/common/**/*.java"/>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/topictests/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/topictests/build.xml
deleted file mode 100644
index ca5e32f0fb..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/topictests/build.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_core_appclient_topictests" basedir="." default="usage">
-<import file="../../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <target name="package">
-      <ts.vehicles name="topictests"> 
-        <jar-elements>
-          <fileset dir="${class.dir}"
-                   includes="com/sun/ts/tests/jms/common/JmsTool.class,
-                             com/sun/ts/tests/jms/common/DoneLatch.class,
-                             com/sun/ts/tests/jms/common/SerialTestMessageListenerImpl.class,
-                             com/sun/ts/tests/jms/common/SessionThread.class,
-                             com/sun/ts/tests/jms/common/TestMessageListener.class"/>
-        </jar-elements>
-      </ts.vehicles>
-  </target>
-
-  <target name="compile">
-      <ts.javac includes="${pkg.dir}/**/*.java,
-                          com/sun/ts/tests/jms/common/**/*.java"/>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/txqueuetests/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/txqueuetests/build.xml
deleted file mode 100644
index 34d639a519..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/txqueuetests/build.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_core_appclient_txqueuetests" basedir="." default="usage">
-<import file="../../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <target name="package">
-      <ts.vehicles name="txqueuetests"> 
-        <jar-elements>
-          <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"/>
-        </jar-elements>
-      </ts.vehicles>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/txtopictests/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/txtopictests/build.xml
deleted file mode 100644
index b49e0f2028..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core/appclient/txtopictests/build.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_core_appclient_txtopictests" basedir="." default="usage">
-<import file="../../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <target name="package">
-      <ts.vehicles name="txTopicTests"> 
-        <jar-elements>
-          <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"/>
-        </jar-elements>
-      </ts.vehicles>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core/build.xml
deleted file mode 100644
index 26f0355a12..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core/build.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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 basedir="." default="usage" name="jms_core">
-  <import file="../../../../../../../bin/xml/ts.nonleafimport.xml" />
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgQueue/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgQueue/build.xml
deleted file mode 100644
index 90ca4dbca2..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgQueue/build.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_core_bytesMsgQueue" basedir="." default="usage">
-<import file="../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <property name="includes" value="com/sun/ts/tests/jms/common/JmsTool.class"/>
-
-  <target name="package">
-      <ts.vehicles name="bytesMsgQueue"> 
-        <client-elements>
-          <fileset dir="${class.dir}" includes="${includes}"/>
-        </client-elements>
-        <ejb-elements>
-          <fileset dir="${class.dir}" includes="${includes}"/>
-        </ejb-elements>
-        <servlet-elements>
-          <zipfileset dir="${class.dir}" includes="${includes}" prefix="WEB-INF/classes"/>
-        </servlet-elements>
-        <jsp-elements>
-          <zipfileset dir="${class.dir}" includes="${includes}" prefix="WEB-INF/classes"/>
-        </jsp-elements>
-      </ts.vehicles>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgTopic/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgTopic/build.xml
deleted file mode 100644
index f246cf3384..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core/bytesMsgTopic/build.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_core_bytesMsgTopic" basedir="." default="usage">
-<import file="../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <target name="package">
-      <ts.vehicles name="bytesMsgTopic"> 
-        <ejb-elements>
-          <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"/>
-        </ejb-elements>
-        <client-elements>
-          <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"/>
-        </client-elements>
-        <servlet-elements>
-          <zipfileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"
-                      prefix="WEB-INF/classes"/>
-        </servlet-elements>
-        <jsp-elements>
-          <zipfileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"
-                      prefix="WEB-INF/classes"/>
-        </jsp-elements>
-      </ts.vehicles>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueConnection/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueConnection/build.xml
deleted file mode 100644
index 4a37a4794c..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueConnection/build.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_core_closedQueueConnection" basedir="." default="usage">
-<import file="../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <target name="package">
-      <ts.vehicles name="closedQueueConnection"> 
-        <ejb-elements>
-          <fileset dir="${class.dir}"
-                   includes="com/sun/ts/tests/jms/common/JmsTool.class,
-                             com/sun/ts/tests/jms/common/MessageTestImpl.class"/>
-        </ejb-elements>
-        <client-elements>
-          <fileset dir="${class.dir}"
-                   includes="com/sun/ts/tests/jms/common/JmsTool.class,
-                             com/sun/ts/tests/jms/common/MessageTestImpl.class"/>
-        </client-elements>
-        <servlet-elements>
-          <zipfileset dir="${class.dir}"
-                      includes="com/sun/ts/tests/jms/common/JmsTool.class,
-                                com/sun/ts/tests/jms/common/MessageTestImpl.class"
-                      prefix="WEB-INF/classes"/>
-        </servlet-elements>
-        <jsp-elements>
-          <zipfileset dir="${class.dir}"
-                      includes="com/sun/ts/tests/jms/common/JmsTool.class,
-                                com/sun/ts/tests/jms/common/MessageTestImpl.class"
-                      prefix="WEB-INF/classes"/>
-        </jsp-elements>
-      </ts.vehicles>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueReceiver/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueReceiver/build.xml
deleted file mode 100644
index c3bbeae89c..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueReceiver/build.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_core_closedQueueReceiver" basedir="." default="usage">
-<import file="../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <target name="package">
-      <ts.vehicles name="closedQueueReceiver"> 
-        <ejb-elements>
-          <fileset dir="${class.dir}"
-                   includes="com/sun/ts/tests/jms/common/JmsTool.class"/>
-        </ejb-elements>
-        <client-elements>
-         <fileset dir="${class.dir}"
-                  includes="com/sun/ts/tests/jms/common/JmsTool.class"/>
-        </client-elements>
-        <servlet-elements>
-         <zipfileset dir="${class.dir}"
-                     includes="com/sun/ts/tests/jms/common/JmsTool.class"
-                     prefix="WEB-INF/classes"/>
-        </servlet-elements>
-        <jsp-elements>
-         <zipfileset dir="${class.dir}"
-                     includes="com/sun/ts/tests/jms/common/JmsTool.class"
-                     prefix="WEB-INF/classes"/>
-        </jsp-elements>
-      </ts.vehicles>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSender/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSender/build.xml
deleted file mode 100644
index d5f2fcf474..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSender/build.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_core_closedQueueSender" basedir="." default="usage">
-<import file="../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <target name="package">
-      <ts.vehicles name="closedQueueSender"> 
-        <ejb-elements>
-          <fileset dir="${class.dir}" 
-                   includes="com/sun/ts/tests/jms/common/JmsTool.class,
-                             com/sun/ts/tests/jms/common/MessageTestImpl.class"/>
-        </ejb-elements>
-        <client-elements>
-          <fileset dir="${class.dir}" 
-                   includes="com/sun/ts/tests/jms/common/JmsTool.class,
-                             com/sun/ts/tests/jms/common/MessageTestImpl.class"/>
-        </client-elements>
-        <servlet-elements>
-          <zipfileset dir="${class.dir}" 
-                      includes="com/sun/ts/tests/jms/common/JmsTool.class,
-                                com/sun/ts/tests/jms/common/MessageTestImpl.class"
-                      prefix="WEB-INF/classes"/>
-        </servlet-elements>
-        <jsp-elements>
-          <zipfileset dir="${class.dir}" 
-                      includes="com/sun/ts/tests/jms/common/JmsTool.class,
-                                com/sun/ts/tests/jms/common/MessageTestImpl.class"
-                      prefix="WEB-INF/classes"/>
-        </jsp-elements>
-      </ts.vehicles>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSession/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSession/build.xml
deleted file mode 100644
index 31d9dd3a19..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core/closedQueueSession/build.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_core_closedQueueSession" basedir="." default="usage">
-<import file="../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <property name="includes"
-            value="com/sun/ts/tests/jms/common/JmsTool.class,
-                   com/sun/ts/tests/jms/common/MessageTestImpl.class,
-                   com/sun/ts/tests/jms/common/BytesMessageTestImpl.class,
-                   com/sun/ts/tests/jms/common/MapMessageTestImpl.class,
-                   com/sun/ts/tests/jms/common/ObjectMessageTestImpl.class,
-                   com/sun/ts/tests/jms/common/StreamMessageTestImpl.class,
-                   com/sun/ts/tests/jms/common/TextMessageTestImpl.class"/>
-
-  <target name="package">
-      <ts.vehicles name="closedQueueSession"> 
-        <ejb-elements>
-          <fileset dir="${class.dir}" includes="${includes}"/>
-        </ejb-elements>
-        <client-elements>
-          <fileset dir="${class.dir}" includes="${includes}"/>
-        </client-elements>
-        <servlet-elements>
-          <zipfileset dir="${class.dir}" includes="${includes}"
-                      prefix="WEB-INF/classes"/>
-        </servlet-elements>
-        <jsp-elements>
-          <zipfileset dir="${class.dir}" includes="${includes}"
-                      prefix="WEB-INF/classes"/>
-        </jsp-elements>
-      </ts.vehicles>
-  </target>
-
-  <target name="compile">
-          <ts.javac includes="${pkg.dir}/**/*.java,
-                              com/sun/ts/tests/jms/common/**/*.java"/>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicConnection/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicConnection/build.xml
deleted file mode 100644
index 1c299ce5eb..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicConnection/build.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_core_closedTopicConnection" basedir="." default="usage">
-<import file="../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <target name="package">
-      <ts.vehicles name="closedTopicConnection"> 
-        <ejb-elements>
-          <fileset dir="${class.dir}"
-                   includes="com/sun/ts/tests/jms/common/JmsTool.class,
-                             com/sun/ts/tests/jms/common/MessageTestImpl.class"/>
-        </ejb-elements>
-        <client-elements>
-          <fileset dir="${class.dir}"
-                   includes="com/sun/ts/tests/jms/common/JmsTool.class,
-                             com/sun/ts/tests/jms/common/MessageTestImpl.class"/>
-        </client-elements>
-        <servlet-elements>
-          <zipfileset dir="${class.dir}"
-                      includes="com/sun/ts/tests/jms/common/JmsTool.class,
-                                com/sun/ts/tests/jms/common/MessageTestImpl.class"
-                      prefix="WEB-INF/classes"/>
-        </servlet-elements>
-        <jsp-elements>
-          <zipfileset dir="${class.dir}"
-                      includes="com/sun/ts/tests/jms/common/JmsTool.class,
-                                com/sun/ts/tests/jms/common/MessageTestImpl.class"
-                      prefix="WEB-INF/classes"/>
-        </jsp-elements>
-      </ts.vehicles>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicPublisher/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicPublisher/build.xml
deleted file mode 100644
index bdeede5a7f..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicPublisher/build.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_core_closedTopicPublisher" basedir="." default="usage">
-<import file="../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <target name="package">
-      <ts.vehicles name="closedTopicPublisher"> 
-        <ejb-elements>
-          <fileset dir="${class.dir}" 
-                   includes="com/sun/ts/tests/jms/common/JmsTool.class,
-                             com/sun/ts/tests/jms/common/MessageTestImpl.class"/>
-        </ejb-elements>
-        <client-elements>
-          <fileset dir="${class.dir}" 
-                   includes="com/sun/ts/tests/jms/common/JmsTool.class,
-                             com/sun/ts/tests/jms/common/MessageTestImpl.class"/>
-        </client-elements>
-        <servlet-elements>
-          <zipfileset dir="${class.dir}" 
-                      includes="com/sun/ts/tests/jms/common/JmsTool.class,
-                                com/sun/ts/tests/jms/common/MessageTestImpl.class"
-                      prefix="WEB-INF/classes"/>
-        </servlet-elements>
-        <jsp-elements>
-          <zipfileset dir="${class.dir}" 
-                      includes="com/sun/ts/tests/jms/common/JmsTool.class,
-                                com/sun/ts/tests/jms/common/MessageTestImpl.class"
-                      prefix="WEB-INF/classes"/>
-        </jsp-elements>
-      </ts.vehicles>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSession/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSession/build.xml
deleted file mode 100644
index 7f2fc9d044..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSession/build.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_core_closedTopicSession" basedir="." default="usage">
-<import file="../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <target name="package">
-      <ts.vehicles name="closedTopicSession"> 
-        <ejb-elements>
-          <fileset dir="${class.dir}"
-                   includes="com/sun/ts/tests/jms/common/JmsTool.class,
-                             com/sun/ts/tests/jms/common/MessageTestImpl.class"/>
-        </ejb-elements>
-        <client-elements>
-          <fileset dir="${class.dir}"
-                   includes="com/sun/ts/tests/jms/common/JmsTool.class,
-                             com/sun/ts/tests/jms/common/MessageTestImpl.class"/>
-        </client-elements>
-        <servlet-elements>
-          <zipfileset dir="${class.dir}"
-                      includes="com/sun/ts/tests/jms/common/JmsTool.class,
-                                com/sun/ts/tests/jms/common/MessageTestImpl.class"
-                      prefix="WEB-INF/classes"/>
-        </servlet-elements>
-        <jsp-elements>
-          <zipfileset dir="${class.dir}"
-                      includes="com/sun/ts/tests/jms/common/JmsTool.class,
-                                com/sun/ts/tests/jms/common/MessageTestImpl.class"
-                      prefix="WEB-INF/classes"/>
-        </jsp-elements>
-      </ts.vehicles>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSubscriber/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSubscriber/build.xml
deleted file mode 100644
index 64568975ab..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core/closedTopicSubscriber/build.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_core_closedTopicSubscriber" basedir="." default="usage">
-<import file="../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <target name="package">
-      <ts.vehicles name="closedTopicSubscriber"> 
-        <ejb-elements>
-          <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"/>
-        </ejb-elements>
-        <client-elements>
-          <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"/>
-        </client-elements>
-        <servlet-elements>
-          <zipfileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"
-                      prefix="WEB-INF/classes"/>
-        </servlet-elements>
-        <jsp-elements>
-          <zipfileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"
-                      prefix="WEB-INF/classes"/>
-        </jsp-elements>
-      </ts.vehicles>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionQueue/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionQueue/build.xml
deleted file mode 100644
index 4d60686a06..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionQueue/build.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_core_exceptionQueue" basedir="." default="usage">
-<import file="../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <target name="package">
-      <ts.vehicles name="exceptionQueue"> 
-        <ejb-elements>
-          <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"/>
-        </ejb-elements>
-        <client-elements>
-          <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"/>
-        </client-elements>
-        <servlet-elements>
-          <zipfileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"
-                      prefix="WEB-INF/classes"/>
-        </servlet-elements>
-        <jsp-elements>
-          <zipfileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"
-                      prefix="WEB-INF/classes"/>
-        </jsp-elements>
-      </ts.vehicles>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionTopic/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionTopic/build.xml
deleted file mode 100644
index 2810212596..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core/exceptionTopic/build.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_core_exceptionTopic" basedir="." default="usage">
-<import file="../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <target name="package">
-      <ts.vehicles name="exceptionTopic"> 
-        <ejb-elements>
-          <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"/>
-        </ejb-elements>
-        <client-elements>
-          <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"/>
-        </client-elements>
-        <servlet-elements>
-          <zipfileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"
-                      prefix="WEB-INF/classes"/>
-        </servlet-elements>
-        <jsp-elements>
-          <zipfileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"
-                      prefix="WEB-INF/classes"/>
-        </jsp-elements>
-      </ts.vehicles>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/exceptiontests/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core/exceptiontests/build.xml
deleted file mode 100644
index c8c730fc99..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core/exceptiontests/build.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_core_exceptiontests" basedir="." default="usage">
-<import file="../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <target name="package">
-      <ts.vehicles name="exceptiontests"/> 
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgQueue/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgQueue/build.xml
deleted file mode 100644
index a7dae74d85..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgQueue/build.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_core_foreignMsgQueue" basedir="." default="usage">
-<import file="../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <property name="includes"
-            value="com/sun/ts/tests/jms.core/foreignMsgQueue/ForeignMsgQueueTests.class,
-                   com/sun/ts/tests/jms/common/JmsTool.class,
-                   com/sun/ts/tests/jms/common/MessageTestImpl.class,
-                   com/sun/ts/tests/jms/common/BytesMessageTestImpl.class,
-                   com/sun/ts/tests/jms/common/MapMessageTestImpl.class,
-                   com/sun/ts/tests/jms/common/TextMessageTestImpl.class,
-                   com/sun/ts/tests/jms/common/StreamMessageTestImpl.class,
-                   com/sun/ts/tests/jms/common/ObjectMessageTestImpl.class"/>
-
-  <target name="package">
-      <ts.vehicles name="foreignMsgQueue"> 
-        <ejb-elements>
-          <fileset dir="${class.dir}" includes="${includes}"/>
-        </ejb-elements>
-        <client-elements>
-          <fileset dir="${class.dir}" includes="${includes}"/>
-        </client-elements>
-        <servlet-elements>
-          <zipfileset dir="${class.dir}" includes="${includes}"
-                      prefix="WEB-INF/classes"/>
-        </servlet-elements>
-        <jsp-elements>
-          <zipfileset dir="${class.dir}" includes="${includes}"
-                      prefix="WEB-INF/classes"/>
-        </jsp-elements>
-      </ts.vehicles>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgTopic/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgTopic/build.xml
deleted file mode 100644
index 747b4cd4f8..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core/foreignMsgTopic/build.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_core_foreignMsgTopic" basedir="." default="usage">
-<import file="../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <property name="includes"
-            value="com/sun/ts/tests/jms/common/JmsTool.class,
-                   com/sun/ts/tests/jms/common/MessageTestImpl.class, 
-                   com/sun/ts/tests/jms/common/BytesMessageTestImpl.class,
-                   com/sun/ts/tests/jms/common/TextMessageTestImpl.class,
-                   com/sun/ts/tests/jms/common/ObjectMessageTestImpl.class,
-                   com/sun/ts/tests/jms/common/MapMessageTestImpl.class,
-                   com/sun/ts/tests/jms/common/StreamMessageTestImpl.class"/>
-
-  <target name="package">
-      <ts.vehicles name="foreignMsgTopic"> 
-        <ejb-elements>
-          <fileset dir="${class.dir}" includes="${includes}"/>
-        </ejb-elements>
-        <client-elements>
-          <fileset dir="${class.dir}" includes="${includes}"/>
-        </client-elements>
-        <servlet-elements>
-          <zipfileset dir="${class.dir}" includes="${includes}"
-                      prefix="WEB-INF/classes"/>
-        </servlet-elements>
-        <jsp-elements>
-          <zipfileset dir="${class.dir}" includes="${includes}"
-                      prefix="WEB-INF/classes"/>
-        </jsp-elements>
-      </ts.vehicles>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgQueue/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgQueue/build.xml
deleted file mode 100644
index 89d90ec0a2..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgQueue/build.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_core_mapMsgQueue" basedir="." default="usage">
-<import file="../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <target name="package">
-      <ts.vehicles name="mapMsgQueue"> 
-        <ejb-elements>
-          <fileset dir="${class.dir}"
-                   includes="com/sun/ts/tests/jms/common/JmsTool.class,
-                             com/sun/ts/tests/jms.core/mapMsgQueue/MapMsgQueueTests.class"/>
-        </ejb-elements>
-        <client-elements>
-          <fileset dir="${class.dir}"
-                   includes="com/sun/ts/tests/jms/common/JmsTool.class,
-                             com/sun/ts/tests/jms.core/mapMsgQueue/MapMsgQueueTests.class"/>
-        </client-elements>
-        <servlet-elements>
-          <zipfileset dir="${class.dir}"
-                      includes="com/sun/ts/tests/jms/common/JmsTool.class,
-                                com/sun/ts/tests/jms.core/mapMsgQueue/MapMsgQueueTests.class"
-                      prefix="WEB-INF/classes"/>
-        </servlet-elements>
-        <jsp-elements>
-          <zipfileset dir="${class.dir}"
-                      includes="com/sun/ts/tests/jms/common/JmsTool.class,
-                                com/sun/ts/tests/jms.core/mapMsgQueue/MapMsgQueueTests.class"
-                      prefix="WEB-INF/classes"/>
-        </jsp-elements>
-      </ts.vehicles>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgTopic/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgTopic/build.xml
deleted file mode 100644
index 48c0e26c69..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core/mapMsgTopic/build.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_core_mapMsgTopic" basedir="." default="usage">
-<import file="../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <target name="package">
-      <ts.vehicles name="mapMsgTopic"> 
-        <ejb-elements>
-          <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"/>
-        </ejb-elements>
-        <client-elements>
-          <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"/>
-        </client-elements>
-        <servlet-elements>
-          <zipfileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"
-                      prefix="WEB-INF/classes"/>
-        </servlet-elements>
-        <jsp-elements>
-          <zipfileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"
-                      prefix="WEB-INF/classes"/>
-        </jsp-elements>
-      </ts.vehicles>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/messageProducer/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core/messageProducer/build.xml
deleted file mode 100644
index f0c74f3113..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core/messageProducer/build.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_core_messageProducer" basedir="." default="usage">
-<import file="../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <target name="package">
-      <ts.vehicles name="messageProducer"> 
-        <ejb-elements>
-          <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"/>
-        </ejb-elements>
-        <client-elements>
-          <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"/>
-        </client-elements>
-        <servlet-elements>
-          <zipfileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"
-                      prefix="WEB-INF/classes"/>
-        </servlet-elements>
-        <jsp-elements>
-          <zipfileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"
-                      prefix="WEB-INF/classes"/>
-        </jsp-elements>
-      </ts.vehicles>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/messageQueue/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core/messageQueue/build.xml
deleted file mode 100644
index d70b8a01b3..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core/messageQueue/build.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_core_messageQueue" basedir="." default="usage">
-<import file="../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <property name="includes"
-            value="com/sun/ts/tests/jms.core/messageQueue/MessageQueueTest.class,
-                   com/sun/ts/tests/jms/common/JmsTool.class,
-                   com/sun/ts/tests/jms/common/JmsUtil.class"/>
-
-  <target name="package">
-      <ts.vehicles name="messageQueue">
-        <ejb-elements>
-          <fileset dir="${class.dir}" includes="${includes}"/>
-        </ejb-elements>
-        <client-elements>
-          <fileset dir="${class.dir}" includes="${includes}"/>
-        </client-elements>
-        <servlet-elements>
-          <zipfileset dir="${class.dir}" includes="${includes}"
-                      prefix="WEB-INF/classes"/>
-        </servlet-elements>
-        <jsp-elements>
-          <zipfileset dir="${class.dir}" includes="${includes}"
-                      prefix="WEB-INF/classes"/>
-        </jsp-elements>
-      </ts.vehicles>
-  </target>
-
-  <target name="compile">
-        <ts.javac includes="${pkg.dir}/**/*.java,
-                            com/sun/ts/tests/jms/common/**/*.java"/>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/messageTopic/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core/messageTopic/build.xml
deleted file mode 100644
index 2849703777..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core/messageTopic/build.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_core_messageTopic" basedir="." default="usage">
-<import file="../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <target name="package">
-      <ts.vehicles name="messageTopic"> 
-        <ejb-elements>
-          <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"/>
-        </ejb-elements>
-        <client-elements>
-          <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"/>
-        </client-elements>
-        <servlet-elements>
-          <zipfileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"
-                      prefix="WEB-INF/classes"/>
-        </servlet-elements>
-        <jsp-elements>
-          <zipfileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"
-                      prefix="WEB-INF/classes"/>
-        </jsp-elements>
-      </ts.vehicles>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/objectMsgQueue/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core/objectMsgQueue/build.xml
deleted file mode 100644
index 3c9e01ff4a..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core/objectMsgQueue/build.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_core_objectMsgQueue" basedir="." default="usage">
-<import file="../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <target name="package">
-      <ts.vehicles name="objectMsgQueue"> 
-        <ejb-elements>
-          <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"/>
-        </ejb-elements>
-        <client-elements>
-          <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"/>
-        </client-elements>
-        <servlet-elements>
-          <zipfileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"
-                      prefix="WEB-INF/classes"/>
-        </servlet-elements>
-        <jsp-elements>
-          <zipfileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"
-                      prefix="WEB-INF/classes"/>
-        </jsp-elements>
-      </ts.vehicles>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/objectMsgTopic/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core/objectMsgTopic/build.xml
deleted file mode 100644
index 020c36df8e..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core/objectMsgTopic/build.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_core_objectMsgTopic" basedir="." default="usage">
-<import file="../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <target name="package">
-      <ts.vehicles name="objectMsgTopic"> 
-        <ejb-elements>
-          <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"/>
-        </ejb-elements>
-        <client-elements>
-          <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"/>
-        </client-elements>
-        <servlet-elements>
-          <zipfileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"
-                      prefix="WEB-INF/classes"/>
-        </servlet-elements>
-        <jsp-elements>
-          <zipfileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"
-                      prefix="WEB-INF/classes"/>
-        </jsp-elements>
-      </ts.vehicles>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/queueConnection/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core/queueConnection/build.xml
deleted file mode 100644
index 2a37319a17..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core/queueConnection/build.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_core_queueConnection" basedir="." default="usage">
-<import file="../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <target name="package">
-      <ts.vehicles name="queueConnection"> 
-        <ejb-elements>
-          <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"/>
-        </ejb-elements>
-        <client-elements>
-          <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"/>
-        </client-elements>
-        <servlet-elements>
-          <zipfileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"
-                      prefix="WEB-INF/classes"/>
-        </servlet-elements>
-        <jsp-elements>
-          <zipfileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"
-                      prefix="WEB-INF/classes"/>
-        </jsp-elements>
-      </ts.vehicles>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgHeaders/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgHeaders/build.xml
deleted file mode 100644
index e807f6e31b..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgHeaders/build.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_core_queueMsgHeaders" basedir="." default="usage">
-<import file="../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <target name="package">
-      <ts.vehicles name="queueMsgHeaders"> 
-        <ejb-elements>
-          <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"/>
-        </ejb-elements>
-        <client-elements>
-          <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"/>
-        </client-elements>
-        <servlet-elements>
-          <zipfileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"
-                      prefix="WEB-INF/classes"/>
-        </servlet-elements>
-        <jsp-elements>
-          <zipfileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"
-                      prefix="WEB-INF/classes"/>
-        </jsp-elements>
-      </ts.vehicles>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgProperties/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgProperties/build.xml
deleted file mode 100644
index ba2aaeae54..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core/queueMsgProperties/build.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_core_queueMsgProperties" basedir="." default="usage">
-<import file="../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <target name="package">
-      <ts.vehicles name="queueMsgProperties"> 
-        <ejb-elements>
-          <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"/>
-        </ejb-elements>
-        <client-elements>
-          <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"/>
-        </client-elements>
-        <servlet-elements>
-          <zipfileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"
-                      prefix="WEB-INF/classes"/>
-        </servlet-elements>
-        <jsp-elements>
-          <zipfileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"
-                      prefix="WEB-INF/classes"/>
-        </jsp-elements>
-      </ts.vehicles>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/queuetests/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core/queuetests/build.xml
deleted file mode 100644
index cb56e737d9..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core/queuetests/build.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_core_queuetests" basedir="." default="usage">
-<import file="../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <property name="includes"
-            value="com/sun/ts/tests/jms/common/JmsTool.class,
-                   com/sun/ts/tests/jms/common/DoneLatch.class,
-                   com/sun/ts/tests/jms/common/SerialTestMessageListenerImpl.class,
-                   com/sun/ts/tests/jms/common/SessionThread.class,
-                   com/sun/ts/tests/jms/common/TestMessageListener.class"/>
-
-  <target name="package">
-      <ts.vehicles name="queuetests"> 
-        <ejb-elements>
-          <fileset dir="${class.dir}" includes="${includes}"/>
-        </ejb-elements>
-        <client-elements>
-          <fileset dir="${class.dir}" includes="${includes}"/>
-        </client-elements>
-        <servlet-elements>
-          <zipfileset dir="${class.dir}" includes="${includes}"
-                      prefix="WEB-INF/classes"/>
-        </servlet-elements>
-        <jsp-elements>
-          <zipfileset dir="${class.dir}" includes="${includes}"
-                      prefix="WEB-INF/classes"/>
-        </jsp-elements>
-      </ts.vehicles>
-  </target>
-
-  <target name="compile">
-      <ts.javac includes="${pkg.dir}/**/*.java,
-                          com/sun/ts/tests/jms/common/**/*.java"/>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/selectorQueue/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core/selectorQueue/build.xml
deleted file mode 100644
index 7f6b7761d5..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core/selectorQueue/build.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_ee_selectorQueue" basedir="." default="usage">
-<import file="../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <target name="package">
-      <ts.vehicles name="selectorQueue"> 
-        <ejb-elements>
-          <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"/>
-        </ejb-elements>
-        <client-elements>
-          <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"/>
-        </client-elements>
-        <servlet-elements>
-          <zipfileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"
-                      prefix="WEB-INF/classes"/>
-        </servlet-elements>
-        <jsp-elements>
-          <zipfileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"
-                      prefix="WEB-INF/classes"/>
-        </jsp-elements>
-      </ts.vehicles>
-  </target>
-
-  <target name="compile">
-      <ts.javac includes="${pkg.dir}/**/*.java,
-                          com/sun/ts/tests/jms/common/**/*.java"/>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/selectorTopic/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core/selectorTopic/build.xml
deleted file mode 100644
index 4e2a7b6913..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core/selectorTopic/build.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_ee_selectorTopic" basedir="." default="usage">
-<import file="../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <target name="package">
-      <ts.vehicles name="selectorTopic"> 
-        <ejb-elements>
-          <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"/>
-        </ejb-elements>
-        <client-elements>
-          <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"/>
-        </client-elements>
-        <servlet-elements>
-          <zipfileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"
-                      prefix="WEB-INF/classes"/>
-        </servlet-elements>
-        <jsp-elements>
-          <zipfileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"
-                      prefix="WEB-INF/classes"/>
-        </jsp-elements>
-      </ts.vehicles>
-  </target>
-
-  <target name="compile">
-      <ts.javac includes="${pkg.dir}/**/*.java,
-                          com/sun/ts/tests/jms/common/**/*.java"/>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/sessiontests/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core/sessiontests/build.xml
deleted file mode 100644
index 2f0a9ea536..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core/sessiontests/build.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_core_sessiontests" basedir="." default="usage">
-<import file="../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <target name="package">
-      <ts.vehicles name="sessiontests"> 
-        <ejb-elements>
-          <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"/>
-        </ejb-elements>
-        <client-elements>
-          <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"/>
-        </client-elements>
-        <servlet-elements>
-          <zipfileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"
-                      prefix="WEB-INF/classes"/>
-        </servlet-elements>
-        <jsp-elements>
-          <zipfileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"
-                      prefix="WEB-INF/classes"/>
-        </jsp-elements>
-      </ts.vehicles>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgQueue/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgQueue/build.xml
deleted file mode 100644
index 8cd3af770f..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgQueue/build.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_core_streamMsgQueue" basedir="." default="usage">
-<import file="../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <target name="package">
-      <ts.vehicles name="streamMsgQueue"> 
-        <ejb-elements>
-          <fileset dir="${class.dir}"
-                   includes="com/sun/ts/tests/jms/common/JmsTool.class,
-                             com/sun/ts/tests/jms.core/streamMsgQueue/StreamMsgQueueTests.class"/>
-        </ejb-elements>
-        <client-elements>
-          <fileset dir="${class.dir}"
-                   includes="com/sun/ts/tests/jms/common/JmsTool.class,
-                             com/sun/ts/tests/jms.core/streamMsgQueue/StreamMsgQueueTests.class"/>
-        </client-elements>
-        <servlet-elements>
-          <zipfileset dir="${class.dir}"
-                      includes="com/sun/ts/tests/jms/common/JmsTool.class,
-                                com/sun/ts/tests/jms.core/streamMsgQueue/StreamMsgQueueTests.class"
-                      prefix="WEB-INF/classes"/>
-        </servlet-elements>
-        <jsp-elements>
-          <zipfileset dir="${class.dir}"
-                      includes="com/sun/ts/tests/jms/common/JmsTool.class,
-                                com/sun/ts/tests/jms.core/streamMsgQueue/StreamMsgQueueTests.class"
-                      prefix="WEB-INF/classes"/>
-        </jsp-elements>
-      </ts.vehicles>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgTopic/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgTopic/build.xml
deleted file mode 100644
index 3c5eafa46b..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core/streamMsgTopic/build.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_core_streamMsgTopic" basedir="." default="usage">
-<import file="../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <target name="package">
-      <ts.vehicles name="streamMsgTopic"> 
-        <ejb-elements>
-          <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"/>
-        </ejb-elements>
-        <client-elements>
-          <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"/>
-        </client-elements>
-        <servlet-elements>
-          <zipfileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"
-                      prefix="WEB-INF/classes"/>
-        </servlet-elements>
-        <jsp-elements>
-          <zipfileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"
-                      prefix="WEB-INF/classes"/>
-        </jsp-elements>
-      </ts.vehicles>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/topicConnection/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core/topicConnection/build.xml
deleted file mode 100644
index 47678ff458..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core/topicConnection/build.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_core_topicConnection" basedir="." default="usage">
-<import file="../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <target name="package">
-      <ts.vehicles name="topicConnection"> 
-        <ejb-elements>
-          <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"/>
-        </ejb-elements>
-        <client-elements>
-          <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"/>
-        </client-elements>
-        <servlet-elements>
-          <zipfileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"
-                      prefix="WEB-INF/classes"/>
-        </servlet-elements>
-        <jsp-elements>
-          <zipfileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"
-                      prefix="WEB-INF/classes"/>
-        </jsp-elements>
-      </ts.vehicles>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgHeaders/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgHeaders/build.xml
deleted file mode 100644
index 411200a955..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgHeaders/build.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_core_topicMsgHeaders" basedir="." default="usage">
-<import file="../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <target name="package">
-      <ts.vehicles name="topicMsgHeaders"> 
-        <ejb-elements>
-          <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"/>
-        </ejb-elements>
-        <client-elements>
-          <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"/>
-        </client-elements>
-        <servlet-elements>
-          <zipfileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"
-                      prefix="WEB-INF/classes"/>
-        </servlet-elements>
-        <jsp-elements>
-          <zipfileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"
-                      prefix="WEB-INF/classes"/>
-        </jsp-elements>
-      </ts.vehicles>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgProperties/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgProperties/build.xml
deleted file mode 100644
index 7b6c4c5c65..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core/topicMsgProperties/build.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_core_topicMsgProperties" basedir="." default="usage">
-<import file="../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <target name="package">
-      <ts.vehicles name="topicMsgProperties"> 
-        <ejb-elements>
-          <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"/>
-        </ejb-elements>
-        <client-elements>
-          <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"/>
-        </client-elements>
-        <servlet-elements>
-          <zipfileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"
-                      prefix="WEB-INF/classes"/>
-        </servlet-elements>
-        <jsp-elements>
-          <zipfileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"
-                      prefix="WEB-INF/classes"/>
-        </jsp-elements>
-      </ts.vehicles>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core/topictests/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core/topictests/build.xml
deleted file mode 100644
index 0fc632c3b8..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core/topictests/build.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_core_topictests" basedir="." default="usage">
-<import file="../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <target name="package">
-      <ts.vehicles name="topictests"> 
-        <ejb-elements>
-          <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"/>
-        </ejb-elements>
-        <client-elements>
-          <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"/>
-        </client-elements>
-        <servlet-elements>
-          <zipfileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"
-                      prefix="WEB-INF/classes"/>
-        </servlet-elements>
-        <jsp-elements>
-          <zipfileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class"
-                      prefix="WEB-INF/classes"/>
-        </jsp-elements>
-      </ts.vehicles>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/build.xml
deleted file mode 100644
index 4aa587eedd..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/build.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2013, 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
-
--->
-
-<!--
-$Id$
--->
-<project basedir="." default="usage" name="jms">
-  <import file="../../../../../../../../bin/xml/ts.nonleafimport.xml" />
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/jmsconsumertests/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/jmsconsumertests/build.xml
deleted file mode 100644
index 837d097f98..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/jmsconsumertests/build.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2013, 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
-
--->
-
-<!--
-$Id: build.xml 65488 2012-03-19 18:44:05Z af70133 $
--->
-<project name="jms_core20_appclient_jmsconsumertests" basedir="." default="usage">
-<import file="../../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <property name="includes"
-            value="com/sun/ts/tests/jms/common/JmsTool.class"/>
-
-  <target name="package">
-      <ts.vehicles name="jmsconsumertests"> 
-        <client-elements>
-          <fileset dir="${class.dir}" includes="${includes}"/>
-        </client-elements>
-      </ts.vehicles>
-  </target>
-
-  <target name="compile">
-      <ts.javac includes="${pkg.dir}/**/*.java,
-                          com/sun/ts/tests/jms/common/**/*.java"/>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/jmscontextqueuetests/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/jmscontextqueuetests/build.xml
deleted file mode 100644
index c88a084af9..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/jmscontextqueuetests/build.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2013, 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
-
--->
-
-<!--
-$Id$
--->
-<project name="jms_core20_appclient_jmscontextqueuetests" basedir="." default="usage">
-<import file="../../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <property name="includes"
-            value="com/sun/ts/tests/jms/common/JmsTool.class"/>
-
-  <target name="package">
-      <ts.vehicles name="jmscontextqueuetests"> 
-        <client-elements>
-          <fileset dir="${class.dir}" includes="${includes}"/>
-        </client-elements>
-      </ts.vehicles>
-  </target>
-
-  <target name="compile">
-      <ts.javac includes="${pkg.dir}/**/*.java,
-                          com/sun/ts/tests/jms/common/**/*.java"/>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/jmscontexttopictests/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/jmscontexttopictests/build.xml
deleted file mode 100644
index 2ace7b66c6..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/jmscontexttopictests/build.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2013, 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
-
--->
-
-<!--
-$Id$
--->
-<project name="jms_core20.appclient.jmscontexttopictests" basedir="." default="usage">
-<import file="../../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <property name="includes"
-            value="com/sun/ts/tests/jms/common/JmsTool.class"/>
-
-  <target name="package">
-      <ts.vehicles name="jmscontexttopictests"> 
-        <client-elements>
-          <fileset dir="${class.dir}" includes="${includes}"/>
-        </client-elements>
-      </ts.vehicles>
-  </target>
-
-  <target name="compile">
-      <ts.javac includes="${pkg.dir}/**/*.java,
-                          com/sun/ts/tests/jms/common/**/*.java"/>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/listenerexceptiontests/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/listenerexceptiontests/build.xml
deleted file mode 100644
index 53cc098540..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/listenerexceptiontests/build.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2013, 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
-
--->
-
-<!--
-$Id$
--->
-<project name="jms_core20_appclient_listenerexceptiontests" basedir="." default="usage">
-<import file="../../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <property name="includes"
-            value="com/sun/ts/tests/jms/common/JmsTool.class,
-                   com/sun/ts/tests/jms/common/MessageTestImpl.class,
-                   com/sun/ts/tests/jms/common/TextMessageTestImpl.class"/>
-
-  <target name="package">
-      <ts.vehicles name="listenerexceptiontests"> 
-        <client-elements>
-          <fileset dir="${class.dir}" includes="${includes}"/>
-        </client-elements>
-      </ts.vehicles>
-  </target>
-
-  <target name="compile">
-      <ts.javac includes="${pkg.dir}/**/*.java,
-                          com/sun/ts/tests/jms/common/**/*.java"/>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/messageconsumertests/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/messageconsumertests/build.xml
deleted file mode 100644
index d46423ce9d..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/messageconsumertests/build.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2013, 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
-
--->
-
-<!--
-$Id$
--->
-<project name="jms_core20_appclient_messageconsumertests" basedir="." default="usage">
-<import file="../../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <property name="includes"
-            value="com/sun/ts/tests/jms/common/JmsTool.class,
-  	               com/sun/ts/tests/jms/common/MessageTestImpl.class,
-  	               com/sun/ts/tests/jms/common/TextMessageTestImpl.class"/>
-
-  <target name="package">
-      <ts.vehicles name="messageconsumertests"> 
-        <client-elements>
-          <fileset dir="${class.dir}" includes="${includes}"/>
-        </client-elements>
-      </ts.vehicles>
-  </target>
-
-  <target name="compile">
-      <ts.javac includes="${pkg.dir}/**/*.java,
-                          com/sun/ts/tests/jms/common/**/*.java"/>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/messageproducertests/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/messageproducertests/build.xml
deleted file mode 100644
index 2dec341461..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core20/appclient/messageproducertests/build.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2013, 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
-
--->
-
-<!--
-$Id$
--->
-<project name="jms_core20_appclient_messageproducertests" basedir="." default="usage">
-<import file="../../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <property name="includes"
-            value="com/sun/ts/tests/jms/common/JmsTool.class,
-		   com/sun/ts/tests/jms/common/MessageTestImpl.class,
-		   com/sun/ts/tests/jms/common/InvalidTextMessageTestImpl.class"/>
-
-  <target name="package">
-      <ts.vehicles name="messageproducertests"> 
-        <client-elements>
-          <fileset dir="${class.dir}" includes="${includes}"/>
-        </client-elements>
-      </ts.vehicles>
-  </target>
-
-  <target name="compile">
-      <ts.javac includes="${pkg.dir}/**/*.java,
-                          com/sun/ts/tests/jms/common/**/*.java"/>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core20/build.xml
deleted file mode 100644
index 6d664b1c76..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core20/build.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2013, 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
-
--->
-
-<!--
-$Id$
--->
-<project basedir="." default="usage" name="jms">
-  <import file="../../../../../../../bin/xml/ts.nonleafimport.xml" />
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/connectionfactorytests/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core20/connectionfactorytests/build.xml
deleted file mode 100644
index 84adc3c3e8..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core20/connectionfactorytests/build.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2013, 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
-
--->
-
-<!--
-$Id$
--->
-<project name="jms_core20_connectionfactorytests" basedir="." default="usage">
-<import file="../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <property name="includes"
-            value="com/sun/ts/tests/jms/common/JmsTool.class"/>
-
-  <target name="package">
-      <ts.vehicles name="connectionfactorytests"> 
-        <ejb-elements>
-          <fileset dir="${class.dir}" includes="${includes}"/>
-        </ejb-elements>
-        <client-elements>
-          <fileset dir="${class.dir}" includes="${includes}"/>
-        </client-elements>
-        <servlet-elements>
-          <zipfileset dir="${class.dir}" includes="${includes}"
-                      prefix="WEB-INF/classes"/>
-        </servlet-elements>
-        <jsp-elements>
-          <zipfileset dir="${class.dir}" includes="${includes}"
-                      prefix="WEB-INF/classes"/>
-        </jsp-elements>
-      </ts.vehicles>
-  </target>
-
-  <target name="compile">
-      <ts.javac includes="${pkg.dir}/**/*.java,
-                          com/sun/ts/tests/jms/common/**/*.java"/>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsconsumertests/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsconsumertests/build.xml
deleted file mode 100644
index c530a9d31a..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsconsumertests/build.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2013, 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
-
--->
-
-<!--
-$Id$
--->
-<project name="jms_core20_jmsconsumertests" basedir="." default="usage">
-<import file="../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <property name="includes"
-            value="com/sun/ts/tests/jms/common/JmsTool.class"/>
-
-  <target name="package">
-      <ts.vehicles name="jmsconsumertests"> 
-        <ejb-elements>
-          <fileset dir="${class.dir}" includes="${includes}"/>
-        </ejb-elements>
-        <client-elements>
-          <fileset dir="${class.dir}" includes="${includes}"/>
-        </client-elements>
-        <servlet-elements>
-          <zipfileset dir="${class.dir}" includes="${includes}"
-                      prefix="WEB-INF/classes"/>
-        </servlet-elements>
-        <jsp-elements>
-          <zipfileset dir="${class.dir}" includes="${includes}"
-                      prefix="WEB-INF/classes"/>
-        </jsp-elements>
-      </ts.vehicles>
-  </target>
-
-  <target name="compile">
-      <ts.javac includes="${pkg.dir}/**/*.java,
-                          com/sun/ts/tests/jms/common/**/*.java"/>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontextqueuetests/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontextqueuetests/build.xml
deleted file mode 100644
index 4c9f484672..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontextqueuetests/build.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2013, 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
-
--->
-
-<!--
-$Id$
--->
-<project name="jms_core20_jmscontextqueuetests" basedir="." default="usage">
-<import file="../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <property name="includes"
-            value="com/sun/ts/tests/jms/common/JmsTool.class"/>
-
-  <target name="package">
-      <ts.vehicles name="jmscontextqueuetests"> 
-        <ejb-elements>
-          <fileset dir="${class.dir}" includes="${includes}"/>
-        </ejb-elements>
-        <client-elements>
-          <fileset dir="${class.dir}" includes="${includes}"/>
-        </client-elements>
-        <servlet-elements>
-          <zipfileset dir="${class.dir}" includes="${includes}"
-                      prefix="WEB-INF/classes"/>
-        </servlet-elements>
-        <jsp-elements>
-          <zipfileset dir="${class.dir}" includes="${includes}"
-                      prefix="WEB-INF/classes"/>
-        </jsp-elements>
-      </ts.vehicles>
-  </target>
-
-  <target name="compile">
-      <ts.javac includes="${pkg.dir}/**/*.java,
-                          com/sun/ts/tests/jms/common/**/*.java"/>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontexttopictests/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontexttopictests/build.xml
deleted file mode 100644
index 29a16469fd..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmscontexttopictests/build.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2013, 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
-
--->
-
-<!--
-$Id$
--->
-<project name="jms_core20_jmscontexttopictests" basedir="." default="usage">
-<import file="../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <property name="includes"
-            value="com/sun/ts/tests/jms/common/JmsTool.class"/>
-
-  <target name="package">
-      <ts.vehicles name="jmscontexttopictests"> 
-        <ejb-elements>
-          <fileset dir="${class.dir}" includes="${includes}"/>
-        </ejb-elements>
-        <client-elements>
-          <fileset dir="${class.dir}" includes="${includes}"/>
-        </client-elements>
-        <servlet-elements>
-          <zipfileset dir="${class.dir}" includes="${includes}"
-                      prefix="WEB-INF/classes"/>
-        </servlet-elements>
-        <jsp-elements>
-          <zipfileset dir="${class.dir}" includes="${includes}"
-                      prefix="WEB-INF/classes"/>
-        </jsp-elements>
-      </ts.vehicles>
-  </target>
-
-  <target name="compile">
-      <ts.javac includes="${pkg.dir}/**/*.java,
-                          com/sun/ts/tests/jms/common/**/*.java"/>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducerqueuetests/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducerqueuetests/build.xml
deleted file mode 100644
index 6aea7fcdfb..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducerqueuetests/build.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2013, 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
-
--->
-
-<!--
-$Id$
--->
-<project name="jms_core20_jmsproducerqueuetests" basedir="." default="usage">
-<import file="../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <property name="includes"
-            value="com/sun/ts/tests/jms/common/JmsTool.class"/>
-
-  <target name="package">
-      <ts.vehicles name="jmsproducerqueuetests"> 
-        <ejb-elements>
-          <fileset dir="${class.dir}" includes="${includes}"/>
-        </ejb-elements>
-        <client-elements>
-          <fileset dir="${class.dir}" includes="${includes}"/>
-        </client-elements>
-        <servlet-elements>
-          <zipfileset dir="${class.dir}" includes="${includes}"
-                      prefix="WEB-INF/classes"/>
-        </servlet-elements>
-        <jsp-elements>
-          <zipfileset dir="${class.dir}" includes="${includes}"
-                      prefix="WEB-INF/classes"/>
-        </jsp-elements>
-      </ts.vehicles>
-  </target>
-
-  <target name="compile">
-      <ts.javac includes="${pkg.dir}/**/*.java,
-                          com/sun/ts/tests/jms/common/**/*.java"/>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducertopictests/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducertopictests/build.xml
deleted file mode 100644
index a3da4c128a..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core20/jmsproducertopictests/build.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2013, 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
-
--->
-
-<!--
-$Id$
--->
-<project name="jms_core20_jmsproducertopictests" basedir="." default="usage">
-<import file="../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <property name="includes"
-            value="com/sun/ts/tests/jms/common/JmsTool.class"/>
-
-  <target name="package">
-      <ts.vehicles name="jmsproducertopictests"> 
-        <ejb-elements>
-          <fileset dir="${class.dir}" includes="${includes}"/>
-        </ejb-elements>
-        <client-elements>
-          <fileset dir="${class.dir}" includes="${includes}"/>
-        </client-elements>
-        <servlet-elements>
-          <zipfileset dir="${class.dir}" includes="${includes}"
-                      prefix="WEB-INF/classes"/>
-        </servlet-elements>
-        <jsp-elements>
-          <zipfileset dir="${class.dir}" includes="${includes}"
-                      prefix="WEB-INF/classes"/>
-        </jsp-elements>
-      </ts.vehicles>
-  </target>
-
-  <target name="compile">
-      <ts.javac includes="${pkg.dir}/**/*.java,
-                          com/sun/ts/tests/jms/common/**/*.java"/>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/messageproducertests/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core20/messageproducertests/build.xml
deleted file mode 100644
index 2148aa9d5e..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core20/messageproducertests/build.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2013, 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
-
--->
-
-<!--
-$Id$
--->
-<project name="jms_core20_messageproducertests" basedir="." default="usage">
-<import file="../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <property name="includes"
-            value="com/sun/ts/tests/jms/common/JmsTool.class"/>
-
-  <target name="package">
-      <ts.vehicles name="messageproducertests"> 
-        <ejb-elements>
-          <fileset dir="${class.dir}" includes="${includes}"/>
-        </ejb-elements>
-        <client-elements>
-          <fileset dir="${class.dir}" includes="${includes}"/>
-        </client-elements>
-        <servlet-elements>
-          <zipfileset dir="${class.dir}" includes="${includes}"
-                      prefix="WEB-INF/classes"/>
-        </servlet-elements>
-        <jsp-elements>
-          <zipfileset dir="${class.dir}" includes="${includes}"
-                      prefix="WEB-INF/classes"/>
-        </jsp-elements>
-      </ts.vehicles>
-  </target>
-
-  <target name="compile">
-      <ts.javac includes="${pkg.dir}/**/*.java,
-                          com/sun/ts/tests/jms/common/**/*.java"/>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/runtimeexceptiontests/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core20/runtimeexceptiontests/build.xml
deleted file mode 100644
index 2f5f29cd07..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core20/runtimeexceptiontests/build.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2013, 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
-
--->
-
-<!--
-$Id$
--->
-<project name="jms_core20_runtimeexceptiontests" basedir="." default="usage">
-<import file="../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <target name="package">
-      <ts.vehicles name="runtimeexceptiontests"/> 
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/core20/sessiontests/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/core20/sessiontests/build.xml
deleted file mode 100644
index b5f5311f87..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/core20/sessiontests/build.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2013, 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
-
--->
-
-<!--
-$Id$
--->
-<project name="jms_core20_sessiontests" basedir="." default="usage">
-<import file="../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <property name="includes"
-            value="com/sun/ts/tests/jms/common/JmsTool.class"/>
-
-  <target name="package">
-      <ts.vehicles name="sessiontests"> 
-        <ejb-elements>
-          <fileset dir="${class.dir}" includes="${includes}"/>
-        </ejb-elements>
-        <client-elements>
-          <fileset dir="${class.dir}" includes="${includes}"/>
-        </client-elements>
-        <servlet-elements>
-          <zipfileset dir="${class.dir}" includes="${includes}"
-                      prefix="WEB-INF/classes"/>
-        </servlet-elements>
-        <jsp-elements>
-          <zipfileset dir="${class.dir}" includes="${includes}"
-                      prefix="WEB-INF/classes"/>
-        </jsp-elements>
-      </ts.vehicles>
-  </target>
-
-  <target name="compile">
-      <ts.javac includes="${pkg.dir}/**/*.java,
-                          com/sun/ts/tests/jms/common/**/*.java"/>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee/build.xml
deleted file mode 100644
index c33a3cef18..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee/build.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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 basedir="." default="usage" name="jms_ee">
-  <import file="../../../../../../../bin/xml/ts.nonleafimport.xml" />
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/ejb/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee/ejb/build.xml
deleted file mode 100644
index e34a7b1ecc..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee/ejb/build.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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 basedir="." default="usage" name="jms_ee_ejb">
-  <import file="../../../../../../../../bin/xml/ts.nonleafimport.xml" />
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/ejb/queueCMTTests/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee/ejb/queueCMTTests/build.xml
deleted file mode 100644
index 673e3f23ad..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee/ejb/queueCMTTests/build.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_ee_ejb_queueCMTTests" basedir="." default="usage">
-<import file="../../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <target name="package">
-      <ts.ejbjar descriptor="jms_ejb_queueCMTTests_ejb.xml" archivename="jms_ejb_queueCMTTests">
-          <fileset dir="${class.dir}" 
-                   includes="com/sun/ts/tests/jms/commonee/Tests.class,
-                             com/sun/ts/tests/jms/commonee/TestsEJB.class"/>
-      </ts.ejbjar>
-
-      <ts.clientjar descriptor="jms_ejb_queueCMTTests_client.xml" archivename="jms_ejb_queueCMTTests"
-                    mainclass="com.sun.ts.tests.jms.ee.ejb.queueCMTTests.Client">
-        <fileset dir="${class.dir}"
-                includes="com/sun/ts/tests/jms/common/JmsTool.class,
-                          com/sun/ts/tests/jms/commonee/Tests.class"/>
-      </ts.clientjar>
-
-      <ts.ear archivename="jms_ejb_queueCMTTests"/>
-  </target>
-  
-  <target name="compile">
-    <ts.javac includes="${pkg.dir}/**/*.java,
-                        com/sun/ts/tests/jms/commonee/**/*.java,
-                        com/sun/ts/tests/jms/common/**/*.java"/>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/ejb/sessionQtests/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee/ejb/sessionQtests/build.xml
deleted file mode 100644
index a0aec3b9e0..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee/ejb/sessionQtests/build.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_ee_ejb_sessionQtests" basedir="." default="usage">
-<import file="../../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <target name="package">
-      <ts.ejbjar descriptor="jms_ejb_sessionQtests_ejb.xml" archivename="jms_ejb_sessionQtests">
-          <fileset dir="${class.dir}" 
-                   includes="com/sun/ts/tests/jms/commonee/Tests.class,
-                             com/sun/ts/tests/jms/commonee/TestsEJB.class"/>
-      </ts.ejbjar>
-
-      <ts.clientjar descriptor="jms_ejb_sessionQtests_client.xml"
-                    archivename="jms_ejb_sessionQtests"
-                    mainclass="com.sun.ts.tests.jms.ee.ejb.sessionQtests.Client">
-        <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class,
-                                              com/sun/ts/tests/jms/commonee/Tests.class"/>
-      </ts.clientjar>
-
-      <ts.ear archivename="jms_ejb_sessionQtests"/>
-  </target>
-
-  <target name="compile">
-      <ts.javac includes="${pkg.dir}/**/*.java,
-                          com/sun/ts/tests/jms/commonee/**/*.java,
-                          com/sun/ts/tests/jms/common/**/*.java"/>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/ejb/sessionTtests/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee/ejb/sessionTtests/build.xml
deleted file mode 100644
index de642a1a24..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee/ejb/sessionTtests/build.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_ee_ejb_sessionTtests" basedir="." default="usage">
-<import file="../../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <target name="package">
-      <ts.ejbjar descriptor="jms_ejb_sessionTtests_ejb.xml" archivename="jms_ejb_sessionTtests">
-          <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/commonee/TestsT*.class"/>
-      </ts.ejbjar>
-
-      <ts.clientjar descriptor="jms_ejb_sessionTtests_client.xml"
-                    archivename="jms_ejb_sessionTtests"
-                    mainclass="com.sun.ts.tests.jms.ee.ejb.sessionTtests.Client">
-        <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsTool.class,
-                                              com/sun/ts/tests/jms/commonee/TestsT.class"/>
-      </ts.clientjar>
-
-      <ts.ear archivename="jms_ejb_sessionTtests"/>
-  </target>
-
-  <target name="compile">
-      <ts.javac includes="${pkg.dir}/**/*.java,
-                          com/sun/ts/tests/jms/commonee/**/*.java,
-                          com/sun/ts/tests/jms/common/**/*.java"/>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/ejbweb/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee/ejbweb/build.xml
deleted file mode 100644
index 71bb619e1c..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee/ejbweb/build.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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 basedir="." default="usage" name="jms_ee_ejbweb">
-  <import file="../../../../../../../../bin/xml/ts.nonleafimport.xml" />
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/ejbweb/xa/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee/ejbweb/xa/build.xml
deleted file mode 100644
index da17104f91..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee/ejbweb/xa/build.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_ee_ejbweb_xa" basedir="." default="usage">
-<import file="../../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <target name="package">
-      <ts.vehicles name="transaction"/> 
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/build.xml
deleted file mode 100644
index 48eefe99dc..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/build.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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 basedir="." default="usage" name="jms_ee_mdb">
-  <import file="../../../../../../../../bin/xml/ts.nonleafimport.xml" />
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_exceptQ/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_exceptQ/build.xml
deleted file mode 100644
index be0c421f52..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_exceptQ/build.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_ee_mdb_mdb_exceptQ" basedir="." default="usage">
-<import file="../../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <target name="package">
-      <ts.ejbjar descriptor="mdb_exceptQ_ejb.xml" archivename="mdb_exceptQ">
-        <fileset dir="${class.dir}" 
-                 includes="com/sun/ts/tests/jms/commonee/ParentMsgBeanNoTx.class,
-                           com/sun/ts/tests/jms/common/JmsUtil.class"/>
-      </ts.ejbjar>
-
-      <ts.clientjar descriptor="mdb_exceptQ_client.xml" archivename="mdb_exceptQ"
-                    mainclass="com.sun.ts.tests.jms.ee.mdb.mdb_exceptQ.MDBClient"
-                    excludedfiles="${pkg.dir}/MsgBean.class">
-        <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/commonee/Client.class"/>
-      </ts.clientjar>
-
-      <ts.ear archivename="mdb_exceptQ"/>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_exceptT/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_exceptT/build.xml
deleted file mode 100644
index 3df616e34c..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_exceptT/build.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_ee_mdb_mdb_exceptT" basedir="." default="usage">
-<import file="../../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <target name="package">
-      <ts.ejbjar descriptor="mdb_exceptT_ejb.xml" archivename="mdb_exceptT">
-        <fileset dir="${class.dir}" 
-                 includes="com/sun/ts/tests/jms/commonee/ParentMsgBeanNoTx.class,
-                           com/sun/ts/tests/jms/common/JmsUtil.class"/>
-      </ts.ejbjar>
-
-      <ts.clientjar descriptor="mdb_exceptT_client.xml"
-                    archivename="mdb_exceptT" mainclass="com.sun.ts.tests.jms.ee.mdb.mdb_exceptT.MDBClient"
-                    excludedfiles="${pkg.dir}/MsgBean.class">
-        <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/commonee/Client.class"/>
-      </ts.clientjar>
-
-      <ts.ear archivename="mdb_exceptT"/>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgHdrQ/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgHdrQ/build.xml
deleted file mode 100644
index f037374c24..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgHdrQ/build.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_ee_mdb_mdb_msgHdrQ" basedir="." default="usage">
-<import file="../../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <target name="package">
-      <ts.ejbjar descriptor="mdb_msgHdrQ_ejb.xml" archivename="mdb_msgHdrQ">
-        <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsUtil.class,
-                                               com/sun/ts/tests/jms/commonee/MDB_Q_Test.class,
-                                               com/sun/ts/tests/jms/commonee/MDB_Q_TestEJB.class"/>
-      </ts.ejbjar>
-
-      <ts.clientjar descriptor="mdb_msgHdrQ_client.xml" archivename="mdb_msgHdrQ"
-                    mainclass="com.sun.ts.tests.jms.ee.mdb.mdb_msgHdrQ.MDBClient"
-                    excludedfiles="${pkg.dir}/MsgBeanMsgTestHdrQ.class">
-        <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsUtil.class,
-                                              com/sun/ts/tests/jms/commonee/MDB_Q_Test.class"/>
-      </ts.clientjar>
-
-      <ts.ear archivename="mdb_msgHdrQ"/>
-  </target>
-
-  <target name="compile">
-      <ts.javac includes="${pkg.dir}/**/*.java,
-                          com/sun/ts/tests/jms/commonee/**/*.java,
-                          com/sun/ts/tests/jms/common/**/*.java"/>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgHdrT/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgHdrT/build.xml
deleted file mode 100644
index 8b6b9ac393..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgHdrT/build.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_ee_mdb_mdb_msgHdrT" basedir="." default="usage">
-<import file="../../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <target name="package">
-      <ts.ejbjar descriptor="mdb_msgHdrT_ejb.xml" archivename="mdb_msgHdrT">
-        <fileset dir="${class.dir}"  includes="com/sun/ts/tests/jms/common/JmsUtil.class,
-                                               com/sun/ts/tests/jms/commonee/MDB_T_Test.class,
-                                               com/sun/ts/tests/jms/commonee/MDB_T_TestEJB.class"/>
-      </ts.ejbjar>
-
-      <ts.clientjar descriptor="mdb_msgHdrT_client.xml" archivename="mdb_msgHdrT"
-                    mainclass="com.sun.ts.tests.jms.ee.mdb.mdb_msgHdrT.MDBClient"
-                    excludedfiles="${pkg.dir}/MsgBeanMsgTestHdrT.class">
-        <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsUtil.class,
-                                              com/sun/ts/tests/jms/commonee/MDB_T_Test.class"/>
-      </ts.clientjar>
-
-      <ts.ear archivename="mdb_msgHdrT"/>
-  </target>
-
-  <target name="compile">
-      <ts.javac includes="${pkg.dir}/**/*.java,
-                          com/sun/ts/tests/jms/commonee/**/*.java,
-                          com/sun/ts/tests/jms/common/**/*.java"/>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgPropsQ/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgPropsQ/build.xml
deleted file mode 100644
index c2322de66a..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgPropsQ/build.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_ee_mdb_mdb_msgPropsQ" basedir="." default="usage">
-<import file="../../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <target name="package">
-      <ts.ejbjar descriptor="mdb_msgPropsQ_ejb.xml" archivename="mdb_msgPropsQ">
-        <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsUtil.class,
-                                              com/sun/ts/tests/jms/commonee/MDB_Q_Test.class,
-                                              com/sun/ts/tests/jms/commonee/MDB_Q_TestEJB.class"/>
-      </ts.ejbjar>
-
-      <ts.clientjar descriptor="mdb_msgPropsQ_client.xml" archivename="mdb_msgPropsQ"
-                    mainclass="com.sun.ts.tests.jms.ee.mdb.mdb_msgPropsQ.MDBClient"
-                    excludedfiles="${pkg.dir}/MsgBeanMsgTestPropsQ.class">
-        <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsUtil.class,
-                                              com/sun/ts/tests/jms/commonee/MDB_Q_Test.class"/>
-      </ts.clientjar>
-
-      <ts.ear archivename="mdb_msgPropsQ"/>
-  </target>
-
-  <target name="compile">
-      <ts.javac includes="${pkg.dir}/**/*.java,
-                          com/sun/ts/tests/jms/commonee/**/*.java,
-                          com/sun/ts/tests/jms/common/**/*.java"/>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgPropsT/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgPropsT/build.xml
deleted file mode 100644
index 75b0a93aa1..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgPropsT/build.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_ee_mdb_mdb_msgPropsT" basedir="." default="usage">
-<import file="../../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <target name="package">
-      <ts.ejbjar descriptor="mdb_msgPropsT_ejb.xml" archivename="mdb_msgPropsT">
-        <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsUtil.class,
-                                              com/sun/ts/tests/jms/commonee/MDB_T_Test.class,
-                                              com/sun/ts/tests/jms/commonee/MDB_T_TestEJB.class"/>
-      </ts.ejbjar>
-
-      <ts.clientjar descriptor="mdb_msgPropsT_client.xml" archivename="mdb_msgPropsT"
-                    mainclass="com.sun.ts.tests.jms.ee.mdb.mdb_msgPropsT.MDBClient"
-                    excludedfiles="${pkg.dir}/MsgBeanMsgTestPropsT.class">
-        <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsUtil.class,
-                                              com/sun/ts/tests/jms/commonee/MDB_T_Test.class"/>
-      </ts.clientjar>
-
-      <ts.ear archivename="mdb_msgPropsT"/>
-  </target>
-
-  <target name="compile">
-      <ts.javac includes="${pkg.dir}/**/*.java,
-                          com/sun/ts/tests/jms/commonee/**/*.java,
-                          com/sun/ts/tests/jms/common/**/*.java"/>
-   </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ1/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ1/build.xml
deleted file mode 100644
index 3e32444595..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ1/build.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_ee_mdb_mdb_msgTypesQ1" basedir="." default="usage">
-<import file="../../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <target name="package">
-      <ts.ejbjar descriptor="mdb_msgTypesQ1_ejb.xml" archivename="mdb_msgTypesQ1">
-        <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsUtil.class,
-                                              com/sun/ts/tests/jms/commonee/MDB_Q_Test.class,
-                                              com/sun/ts/tests/jms/commonee/MDB_Q_TestEJB.class"/>
-      </ts.ejbjar>
-
-      <ts.clientjar descriptor="mdb_msgTypesQ1_client.xml" archivename="mdb_msgTypesQ1"
-                    mainclass="com.sun.ts.tests.jms.ee.mdb.mdb_msgTypesQ1.MDBClient"
-                    excludedfiles="${pkg.dir}/MsgBean.class">
-        <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsUtil.class,
-                                              com/sun/ts/tests/jms/commonee/MDB_Q_Test.class"/>
-      </ts.clientjar>
-
-      <ts.ear archivename="mdb_msgTypesQ1"/>
-  </target>
-
-  <target name="compile">
-      <ts.javac includes="${pkg.dir}/**/*.java,
-                          com/sun/ts/tests/jms/commonee/**/*.java,
-                          com/sun/ts/tests/jms/common/**/*.java"/>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ2/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ2/build.xml
deleted file mode 100644
index 3a1a034b9c..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ2/build.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_ee_mdb_mdb_msgTypesQ2" basedir="." default="usage">
-<import file="../../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <target name="package">
-      <ts.ejbjar descriptor="mdb_msgTypesQ2_ejb.xml" archivename="mdb_msgTypesQ2">
-        <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsUtil.class,
-                                              com/sun/ts/tests/jms/commonee/MDB_Q_Test.class,
-                                              com/sun/ts/tests/jms/commonee/MDB_Q_TestEJB.class"/>
-      </ts.ejbjar>
-
-      <ts.clientjar descriptor="mdb_msgTypesQ2_client.xml" archivename="mdb_msgTypesQ2"
-                    mainclass="com.sun.ts.tests.jms.ee.mdb.mdb_msgTypesQ2.MDBClient"
-                    excludedfiles="${pkg.dir}/MsgBeanMsgTestQ2.class">
-        <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsUtil.class,
-                                              com/sun/ts/tests/jms/commonee/MDB_Q_Test.class"/>
-      </ts.clientjar>
-
-      <ts.ear archivename="mdb_msgTypesQ2"/>
-  </target>
-
-  <target name="compile">
-      <ts.javac includes="${pkg.dir}/**/*.java,
-                          com/sun/ts/tests/jms/commonee/**/*.java,
-                          com/sun/ts/tests/jms/common/**/*.java"/>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ3/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ3/build.xml
deleted file mode 100644
index 058182b5d9..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesQ3/build.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_ee_mdb_mdb_msgTypesQ3" basedir="." default="usage">
-<import file="../../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <target name="package">
-      <ts.ejbjar descriptor="mdb_msgTypesQ3_ejb.xml" archivename="mdb_msgTypesQ3">
-        <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsUtil.class,
-                                              com/sun/ts/tests/jms/commonee/MDB_Q_Test.class,
-                                              com/sun/ts/tests/jms/commonee/MDB_Q_TestEJB.class"/>
-      </ts.ejbjar>
-
-      <ts.clientjar descriptor="mdb_msgTypesQ3_client.xml" archivename="mdb_msgTypesQ3"
-                    mainclass="com.sun.ts.tests.jms.ee.mdb.mdb_msgTypesQ3.MDBClient"
-                    excludedfiles="${pkg.dir}/MsgBeanMsgTestQ3.class">
-        <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsUtil.class,
-                                              com/sun/ts/tests/jms/commonee/MDB_Q_Test.class"/>
-      </ts.clientjar>
-
-      <ts.ear archivename="mdb_msgTypesQ3"/>
-  </target>
-
-  <target name="compile">
-      <ts.javac includes="${pkg.dir}/**/*.java,
-                          com/sun/ts/tests/jms/commonee/**/*.java,
-                          com/sun/ts/tests/jms/common/**/*.java"/>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT1/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT1/build.xml
deleted file mode 100644
index 8cbe900eac..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT1/build.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_ee_mdb_mdb_msgTypesT1" basedir="." default="usage">
-<import file="../../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <target name="package">
-      <ts.ejbjar descriptor="mdb_msgTypesT1_ejb.xml" archivename="mdb_msgTypesT1">
-        <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsUtil.class,
-                                              com/sun/ts/tests/jms/commonee/MDB_T_Test.class,
-                                              com/sun/ts/tests/jms/commonee/MDB_T_TestEJB.class"/>
-      </ts.ejbjar>
-
-      <ts.clientjar descriptor="mdb_msgTypesT1_client.xml" archivename="mdb_msgTypesT1"
-                    mainclass="com.sun.ts.tests.jms.ee.mdb.mdb_msgTypesT1.MDBClient"
-                    excludedfiles="${pkg.dir}/MsgBeanMsgTestT1.class">
-        <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsUtil.class,
-                                              com/sun/ts/tests/jms/commonee/MDB_T_Test.class"/>
-      </ts.clientjar>
-
-      <ts.ear archivename="mdb_msgTypesT1"/>
-  </target>
-
-  <target name="compile">
-      <ts.javac includes="${pkg.dir}/**/*.java,
-                          com/sun/ts/tests/jms/commonee/**/*.java,
-                          com/sun/ts/tests/jms/common/**/*.java"/>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT2/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT2/build.xml
deleted file mode 100644
index 7fa9b8a30e..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT2/build.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_ee_mdb_mdb_msgTypesT2" basedir="." default="usage">
-<import file="../../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <target name="package">
-      <ts.ejbjar descriptor="mdb_msgTypesT2_ejb.xml" archivename="mdb_msgTypesT2">
-        <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsUtil.class,
-                                              com/sun/ts/tests/jms/commonee/MDB_T_Test.class,
-                                              com/sun/ts/tests/jms/commonee/MDB_T_TestEJB.class"/>
-      </ts.ejbjar>
-
-      <ts.clientjar descriptor="mdb_msgTypesT2_client.xml" archivename="mdb_msgTypesT2"
-                    mainclass="com.sun.ts.tests.jms.ee.mdb.mdb_msgTypesT2.MDBClient"
-                    excludedfiles="${pkg.dir}/MsgBeanMsgTestT2.class">
-        <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsUtil.class,
-                                              com/sun/ts/tests/jms/commonee/MDB_T_Test.class"/>
-      </ts.clientjar>
-
-      <ts.ear archivename="mdb_msgTypesT2"/>
-  </target>
-
-  <target name="compile">
-      <ts.javac includes="${pkg.dir}/**/*.java,
-                          com/sun/ts/tests/jms/commonee/**/*.java,
-                          com/sun/ts/tests/jms/common/**/*.java"/>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT3/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT3/build.xml
deleted file mode 100644
index 6e01d8cc82..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_msgTypesT3/build.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_ee_mdb_mdb_msgTypesT3" basedir="." default="usage">
-<import file="../../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <target name="package">
-      <ts.ejbjar descriptor="mdb_msgTypesT3_ejb.xml" archivename="mdb_msgTypesT3">
-        <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsUtil.class,
-                                              com/sun/ts/tests/jms/commonee/MDB_T_Test.class,
-                                              com/sun/ts/tests/jms/commonee/MDB_T_TestEJB.class"/>
-      </ts.ejbjar>
-
-      <ts.clientjar descriptor="mdb_msgTypesT3_client.xml" archivename="mdb_msgTypesT3"
-                    mainclass="com.sun.ts.tests.jms.ee.mdb.mdb_msgTypesT3.MDBClient"
-                    excludedfiles="${pkg.dir}/MsgBeanMsgTestT3.class">
-        <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsUtil.class,
-                                              com/sun/ts/tests/jms/commonee/MDB_T_Test.class"/>
-      </ts.clientjar>
-
-      <ts.ear archivename="mdb_msgTypesT3"/>
-  </target>
-
-  <target name="compile">
-      <ts.javac includes="${pkg.dir}/**/*.java,
-                          com/sun/ts/tests/jms/commonee/**/*.java,
-                          com/sun/ts/tests/jms/common/**/*.java"/>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_rec/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_rec/build.xml
deleted file mode 100644
index aed2870f01..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_rec/build.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_ee_mdb_mdb_rec" basedir="." default="usage">
-<import file="../../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <target name="package">
-      <ts.ejbjar descriptor="mdb_asynch_receives_ejb.xml" archivename="mdb_asynch_receives">
-        <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsUtil.class"/>
-      </ts.ejbjar>
-
-      <ts.clientjar descriptor="mdb_asynch_receives_client.xml" archivename="mdb_asynch_receives"
-                    mainclass="com.sun.ts.tests.jms.ee.mdb.mdb_rec.MDBClient"
-                    excludedfiles="${pkg.dir}/MDB_AR_TestEJB.class
-                                   ${pkg.dir}/MsgBeanForQueue.class,
-                                   ${pkg.dir}/MsgBeanForTopic.class">
-        <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsUtil.class"/>
-      </ts.clientjar>
-
-      <ts.ear archivename="mdb_asynch_receives"/>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndQ/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndQ/build.xml
deleted file mode 100644
index 350e0f4d79..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndQ/build.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_ee_mdb_mdb_sndQ" basedir="." default="usage">
-<import file="../../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <target name="package">
-      <ts.ejbjar descriptor="mdb_sndQ_ejb.xml" archivename="mdb_sndQ">
-        <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsUtil.class"/>
-      </ts.ejbjar>
-
-      <ts.clientjar descriptor="mdb_sndQ_client.xml" archivename="mdb_sndQ"
-                    mainclass="com.sun.ts.tests.jms.ee.mdb.mdb_sndQ.MDBClient"
-                    excludedfiles="${pkg.dir}/MDB_SNDQ_TestEJB.class, ${pkg.dir}/MsgBean.class">
-        <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsUtil.class"/>
-      </ts.clientjar>
-
-      <ts.ear archivename="mdb_sndQ"/>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndToQueue/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndToQueue/build.xml
deleted file mode 100644
index ff7ec8b862..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndToQueue/build.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_ee_mdb_mdb_sndToQueue" basedir="." default="usage">
-<import file="../../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <target name="package">
-      <ts.ejbjar descriptor="mdb_sndToQueue_ejb.xml" archivename="mdb_sndToQueue">
-        <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsUtil.class,
-                                              com/sun/ts/tests/jms/commonee/MDB_Q_Test.class,
-                                              com/sun/ts/tests/jms/commonee/MDB_Q_TestEJB.class"/>
-      </ts.ejbjar>
-
-      <ts.clientjar descriptor="mdb_sndToQueue_client.xml" archivename="mdb_sndToQueue"
-                    mainclass="com.sun.ts.tests.jms.ee.mdb.mdb_sndToQueue.MDBClient"
-                    excludedfiles="${pkg.dir}/MsgBean.class">
-        <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsUtil.class,
-                                              com/sun/ts/tests/jms/commonee/MDB_Q_Test.class"/>
-      </ts.clientjar>
-
-      <ts.ear archivename="mdb_sndToQueue"/>
-  </target>
-
-  <target name="compile">
-      <ts.javac includes="${pkg.dir}/**/*.java,
-                          com/sun/ts/tests/jms/commonee/**/*.java,
-                          com/sun/ts/tests/jms/common/**/*.java"/>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndToTopic/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndToTopic/build.xml
deleted file mode 100644
index 4bb6c2f7a8..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_sndToTopic/build.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_ee_mdb_mdb_sndToTopic" basedir="." default="usage">
-<import file="../../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <target name="package">
-      <ts.ejbjar descriptor="mdb_sndToTopic_ejb.xml" archivename="mdb_sndToTopic">
-        <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsUtil.class,
-                                              com/sun/ts/tests/jms/commonee/MDB_T_Test.class,
-                                              com/sun/ts/tests/jms/commonee/MDB_T_TestEJB.class"/>
-      </ts.ejbjar>
-
-      <ts.clientjar descriptor="mdb_sndToTopic_client.xml" archivename="mdb_sndToTopic"
-                    mainclass="com.sun.ts.tests.jms.ee.mdb.mdb_sndToTopic.MDBClient"
-                    excludedfiles="${pkg.dir}/MsgBeanToTopic.class, ${pkg.dir}/MsgBeanTopic.class">
-        <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsUtil.class,
-                                              com/sun/ts/tests/jms/commonee/MDB_T_Test.class"/>
-      </ts.clientjar>
-
-      <ts.ear archivename="mdb_sndToTopic"/>
-  </target>
-
-  <target name="compile">
-      <ts.javac includes="${pkg.dir}/**/*.java,
-                          com/sun/ts/tests/jms/commonee/**/*.java,
-                          com/sun/ts/tests/jms/common/**/*.java"/>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_synchrec/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_synchrec/build.xml
deleted file mode 100644
index 65fb27b991..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/mdb_synchrec/build.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_ee_mdb_mdb_synchrec" basedir="." default="usage">
-<import file="../../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <target name="package">
-      <ts.ejbjar descriptor="mdb_synchrec_ejb.xml" archivename="mdb_synchrec">
-        <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsUtil.class"/>
-      </ts.ejbjar>
-
-      <ts.clientjar descriptor="mdb_synchrec_client.xml" archivename="mdb_synchrec"
-                    mainclass="com.sun.ts.tests.jms.ee.mdb.mdb_synchrec.MDBClient"
-                    excludedfiles="${pkg.dir}/MsgBean.class">
-        <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsUtil.class"/>
-      </ts.clientjar>
-
-      <ts.ear archivename="mdb_synchrec"/>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/xa/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/xa/build.xml
deleted file mode 100644
index e05b7a039e..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee/mdb/xa/build.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_ee_mdb_xa" basedir="." default="usage">
-<import file="../../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <target name="package">
-      <ts.ejbjar descriptor="mdb_msg_xa_ejb.xml" archivename="mdb_msg_xa">
-        <fileset dir="${class.dir}" includes="com/sun/ts/tests/jms/common/JmsUtil.class"/>
-      </ts.ejbjar>
-
-      <ts.clientjar descriptor="mdb_msg_xa_client.xml" archivename="mdb_msg_xa"
-                    mainclass="com.sun.ts.tests.jms.ee.mdb.xa.MDBClient"
-                    excludedfiles="${pkg.dir}/MsgBeanxa.class">
-        <fileset dir="${class.dir}"
-                 includes="com/sun/ts/tests/jms/commonee/Client.class,
-                           com/sun/ts/tests/jms/common/JmsUtil.class"/>
-      </ts.clientjar>
-
-      <ts.ear archivename="mdb_msg_xa"/>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee20/build.xml
deleted file mode 100644
index 9102d7ab46..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/build.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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 basedir="." default="usage" name="jms_ee20">
-  <import file="../../../../../../../bin/xml/ts.nonleafimport.xml" />
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/cditests/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee20/cditests/build.xml
deleted file mode 100644
index 3e1e4af767..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/cditests/build.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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 basedir="." default="usage" name="jms_ee20_cditests">
-  <import file="../../../../../../../../bin/xml/ts.nonleafimport.xml" />
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/cditests/ejbweb/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee20/cditests/ejbweb/build.xml
deleted file mode 100644
index 83e3871f2a..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/cditests/ejbweb/build.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
-    Copyright (c) 2013, 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="jms_ee20_cditests_ejbweb" basedir="." default="usage">
-<import file="../../../../../../../../../bin/xml/ts.import.xml"/>
-
-  <property name="current.dir" value="${basedir}"/>
-  <property name="app.name" value="cditestsejbweb"/>
-  <property name="dd.files.already.exist" value="true"/>
-  <property name="managedbean.classes" value="${pkg.dir}/MyManagedBean.class"/>
-
-  <target name="package" >
-      <ts.clientjar archivename="${app.name}" mainclass="com.sun.ts.tests.jms.ee20.cditests.ejbweb.Client" excludedfiles="${pkg.dir}/ServletClient.class, ${pkg.dir}/EjbClient.class, ${managedbean.classes}">
-	<zipfileset dir="${class.dir}" includes="${other}, ${pkg.dir}/Client.class, ${pkg.dir}/EjbClientIf.class"/>
-      </ts.clientjar>
-      <ts.ejbjar archivename="${app.name}" descriptor="${app.name}_ejb.xml" excludedfiles="${pkg.dir}/Client.class, ${pkg.dir}/ServletClient.class, ${managedbean.classes}">
-	<zipfileset dir="${src.dir}/${pkg.dir}/../resources" includes="beans.xml"  prefix="META-INF"/>
-	<zipfileset dir="${class.dir}" includes="${other}, ${pkg.dir}/EjbClientIF.class, ${pkg.dir}/EjbClient.class"/>
-      </ts.ejbjar>
-      <ts.war archivename="${app.name}" descriptor="${app.name}_web.xml" excludedfiles="${pkg.dir}/Client.class, ${pkg.dir}/EjbClient.class, ${pkg.dir}/EjbClientIf.class">
-	<zipfileset dir="${src.dir}/${pkg.dir}/../resources" includes="beans.xml"  prefix="WEB-INF"/>
-	<zipfileset dir="${class.dir}" includes="${other}, ${pkg.dir}/ServletClient.class, ${managedbean.classes}" prefix="WEB-INF/classes"/>
-      </ts.war>
-      <copy file="application.xml.clientear" tofile="application.xml"/>
-      <ts.ear archivename="${app.name}" descriptordir="." descriptor="application.xml" includedefaultfiles="false">
-         <zipfileset dir="${dist.dir}/${pkg.dir}" includes="${app.name}_client.jar"/>
-         <zipfileset dir="${dist.dir}/${pkg.dir}" includes="${app.name}_web.war"/>
-         <zipfileset dir="${dist.dir}/${pkg.dir}" includes="${app.name}_ejb.jar"/>
-      </ts.ear>
-      <delete file="application.xml" />
-  </target>
-
-  <target name="compile" depends="clean, TestImport.compile"/>
-
-  <target name="build" depends="clean, TestImport.build"/>
-
-  <target name="clean" >
-    <ts.clean/>
-  </target>
-
-
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/cditests/mdb/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee20/cditests/mdb/build.xml
deleted file mode 100644
index 4e71a0dce7..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/cditests/mdb/build.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
-    Copyright (c) 2013, 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="jms_ee20_cditests_mdb" basedir="." default="usage">
-<import file="../../../../../../../../../bin/xml/ts.import.xml"/>
-
-  <property name="current.dir" value="${basedir}"/>
-  <property name="app.name" value="cditestsmdb"/>
-  <property name="dd.files.already.exist" value="true"/>
-
-  <target name="package" >
-      <ts.clientjar archivename="${app.name}" mainclass="com.sun.ts.tests.jms.ee20.cditests.mdb.Client" excludedfiles="${pkg.dir}/EjbClient.class, ${pkg.dir}/MsgBeanQ.class">
-	<zipfileset dir="${class.dir}" includes="${pkg.dir}/Client.class, ${pkg.dir}/EjbClientIf.class"/>
-      </ts.clientjar>
-      <ts.ejbjar archivename="${app.name}" descriptor="${app.name}_ejb.xml" excludedfiles="${pkg.dir}/Client.class">
-	<zipfileset dir="${src.dir}/${pkg.dir}/../resources" includes="beans.xml"  prefix="META-INF"/>
-	<zipfileset dir="${class.dir}" includes="${pkg.dir}/EjbClientIF.class, ${pkg.dir}/EjbClient.class"/>
-      </ts.ejbjar>
-      <copy file="application.xml.clientear" tofile="application.xml"/>
-      <ts.ear archivename="${app.name}" descriptordir="." descriptor="application.xml" includedefaultfiles="false">
-         <zipfileset dir="${dist.dir}/${pkg.dir}" includes="${app.name}_client.jar"/>
-         <zipfileset dir="${dist.dir}/${pkg.dir}" includes="${app.name}_ejb.jar"/>
-      </ts.ear>
-      <delete file="application.xml" />
-  </target>
-
-  <target name="compile" depends="clean, TestImport.compile"/>
-
-  <target name="build" depends="clean, TestImport.build"/>
-
-  <target name="clean">
-    <ts.clean/>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/cditests/usecases/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee20/cditests/usecases/build.xml
deleted file mode 100644
index f376340c2b..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/cditests/usecases/build.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
-    Copyright (c) 2013, 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="jms_ee20_cditests_usecases" basedir="." default="usage">
-<import file="../../../../../../../../../bin/xml/ts.import.xml"/>
-
-  <property name="current.dir" value="${basedir}"/>
-  <property name="app.name" value="cditestsusecases"/>
-  <property name="dd.files.already.exist" value="true"/>
-  <echo message="pkg.dir=${pkg.dir}"/>
-
-  <target name="package" >
-      <ts.clientjar archivename="${app.name}" mainclass="com.sun.ts.tests.jms.ee20.cditests.usecases.Client" 
-	excludedfiles="${pkg.dir}/CMBean1.class, ${pkg.dir}/CMBean2.class, ${pkg.dir}/BMBean1.class, ${pkg.dir}/BMBean2.class">
-	<zipfileset dir="${class.dir}" includes="${other}, ${pkg.dir}/Client.class, ${pkg.dir}/CMBean1IF.class, ${pkg.dir}/CMBean2IF.class, ${pkg.dir}/BMBean1IF.class, ${pkg.dir}/BMBean2IF.class"/>
-      </ts.clientjar>
-      <ts.ejbjar archivename="${app.name}" descriptor="${app.name}_ejb.xml" excludedfiles="${pkg.dir}/Client.class">
-	<zipfileset dir="${src.dir}/${pkg.dir}/../resources" includes="beans.xml"  prefix="META-INF"/>
-	<zipfileset dir="${class.dir}" includes="${other}, ${pkg.dir}/CMBean*.class, ${pkg.dir}/BMBean*.class"/>
-      </ts.ejbjar>
-      <copy file="application.xml.clientear" tofile="application.xml"/>
-      <ts.ear archivename="${app.name}" descriptordir="." descriptor="application.xml" includedefaultfiles="false">
-         <zipfileset dir="${dist.dir}/${pkg.dir}" includes="${app.name}_client.jar"/>
-         <zipfileset dir="${dist.dir}/${pkg.dir}" includes="${app.name}_ejb.jar"/>
-      </ts.ear>
-      <delete file="application.xml" />
-  </target>
-
-  <target name="compile" >
-      <ts.javac includes="${pkg.dir}/**/*.java"/>
-  </target>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/build.xml
deleted file mode 100644
index 421d370114..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/build.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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 basedir="." default="usage" name="jms_ee20_ra_activationconfig">
-  <import file="../../../../../../../../../bin/xml/ts.nonleafimport.xml" />
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/common/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/common/build.xml
deleted file mode 100644
index e69b6bda13..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/common/build.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_ee20_ra_activationconfig_common" basedir="." default="usage">
-    <import file="../../../../../../../../../../bin/xml/ts.import.xml"/>   
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/build.xml
deleted file mode 100644
index 533843ca70..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/build.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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 basedir="." default="usage" name="jms_ee20_ra_activationconfig_queue">
-  <import file="../../../../../../../../../../bin/xml/ts.nonleafimport.xml" />
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/annotated/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/annotated/build.xml
deleted file mode 100644
index 6ed0988551..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/annotated/build.xml
+++ /dev/null
@@ -1,51 +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="jms_ee20_ra_activationconfig_queue_selectorauto_annotated" default="usage" basedir=".">
-  <property name="app.name" value="queue_selectorauto_annotated"/>
-  <property name="client" value="com.sun.ts.tests.jms.ee20.ra.activationconfig.queue.selectorauto.annotated.Client"/>
-  <property name="pkg.dir" value="com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/annotated"/>
-  <property name="app.common" value="com/sun/ts/tests/jms/ee20/ra/activationconfig/common"/>
-
-  <property name="ejb.jar.classes" 
-            value="
-com/sun/ts/tests/jms/ee20/ra/activationconfig/common/ActivationConfigBeanBase.class,
-com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/annotated/ActivationConfigBean.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/TLogger.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/Constants.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/StatusReporter.class,
-com/sun/ts/tests/jms/common/JmsUtil.class
-            "/>
-  
-  <property name="appclient.jar.classes" 
-            value="
-com/sun/ts/lib/harness/EETest$Fault.class,
-com/sun/ts/lib/harness/EETest$SetupException.class,
-com/sun/ts/lib/harness/EETest.class,
-com/sun/ts/tests/jms/ee20/ra/activationconfig/common/QueueClientBase.class,
-com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/annotated/Client.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/TLogger.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/QueueClientBase.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/Constants.class,
-com/sun/ts/tests/jms/commonee/Client.class
-            "/>
-    
-  <import file="../../../../../../../../../../../../src/com/sun/ts/tests/jms/ee20/ra/common/messaging/import.xml"/>  
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/build.xml
deleted file mode 100644
index 8940274c66..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/build.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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 basedir="." default="usage" name="jms_ee20_ra_activationconfig_queue_selectorauto">
-  <import file="../../../../../../../../../../../bin/xml/ts.nonleafimport.xml" />
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/descriptor/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/descriptor/build.xml
deleted file mode 100644
index b187ea1c39..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/descriptor/build.xml
+++ /dev/null
@@ -1,51 +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="jms_ee20_ra_activationconfig_queue_selectorauto_descriptor" default="usage" basedir=".">
-  <property name="app.name" value="queue_selectorauto_descriptor"/>
-  <property name="client" value="com.sun.ts.tests.jms.ee20.ra.activationconfig.queue.selectorauto.descriptor.Client"/>
-  <property name="pkg.dir" value="com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/descriptor"/>
-  <property name="app.common" value="com/sun/ts/tests/jms/ee20/ra/activationconfig/common"/>
-
-  <property name="ejb.jar.classes" 
-            value="
-com/sun/ts/tests/jms/ee20/ra/activationconfig/common/ActivationConfigBeanBase.class,
-com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/descriptor/ActivationConfigBean.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/TLogger.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/Constants.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/StatusReporter.class,
-com/sun/ts/tests/jms/common/JmsUtil.class
-            "/>
-  
-  <property name="appclient.jar.classes" 
-            value="
-com/sun/ts/lib/harness/EETest$Fault.class,
-com/sun/ts/lib/harness/EETest$SetupException.class,
-com/sun/ts/lib/harness/EETest.class,
-com/sun/ts/tests/jms/ee20/ra/activationconfig/common/QueueClientBase.class,
-com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/descriptor/Client.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/TLogger.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/QueueClientBase.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/Constants.class,
-com/sun/ts/tests/jms/commonee/Client.class
-            "/>
-    
-  <import file="../../../../../../../../../../../../src/com/sun/ts/tests/jms/ee20/ra/common/messaging/import.xml"/>  
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectordups/annotated/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectordups/annotated/build.xml
deleted file mode 100644
index 823fa14313..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectordups/annotated/build.xml
+++ /dev/null
@@ -1,51 +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="jms_ee20_ra_activationconfig_queue_selectordups_annotated" default="usage" basedir=".">
-  <property name="app.name" value="queue_selectordups_annotated"/>
-  <property name="client" value="com.sun.ts.tests.jms.ee20.ra.activationconfig.queue.selectordups.annotated.Client"/>
-  <property name="pkg.dir" value="com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectordups/annotated"/>
-  <property name="app.common" value="com/sun/ts/tests/jms/ee20/ra/activationconfig/common"/>
-
-  <property name="ejb.jar.classes" 
-            value="
-com/sun/ts/tests/jms/ee20/ra/activationconfig/common/ActivationConfigBeanBase.class,
-com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectordups/annotated/ActivationConfigBean.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/TLogger.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/Constants.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/StatusReporter.class,
-com/sun/ts/tests/jms/common/JmsUtil.class
-            "/>
-  
-  <property name="appclient.jar.classes" 
-            value="
-com/sun/ts/lib/harness/EETest$Fault.class,
-com/sun/ts/lib/harness/EETest$SetupException.class,
-com/sun/ts/lib/harness/EETest.class,
-com/sun/ts/tests/jms/ee20/ra/activationconfig/common/QueueClientBase.class,
-com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectordups/annotated/Client.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/TLogger.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/QueueClientBase.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/Constants.class,
-com/sun/ts/tests/jms/commonee/Client.class
-            "/>
-    
-  <import file="../../../../../../../../../../../../src/com/sun/ts/tests/jms/ee20/ra/common/messaging/import.xml"/>  
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectordups/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectordups/build.xml
deleted file mode 100644
index 17f73837ad..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectordups/build.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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 basedir="." default="usage" name="jms_ee20_ra_activationconfig_queue_selectordups">
-  <import file="../../../../../../../../../../../bin/xml/ts.nonleafimport.xml" />
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectordups/descriptor/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectordups/descriptor/build.xml
deleted file mode 100644
index d2e1c87b60..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectordups/descriptor/build.xml
+++ /dev/null
@@ -1,51 +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="jms_ee20_ra_activationconfig_queue_selectordups_descriptor" default="usage" basedir=".">
-  <property name="app.name" value="queue_selectordups_descriptor"/>
-  <property name="client" value="com.sun.ts.tests.jms.ee20.ra.activationconfig.queue.selectordups.descriptor.Client"/>
-  <property name="pkg.dir" value="com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectordups/descriptor"/>
-  <property name="app.common" value="com/sun/ts/tests/jms/ee20/ra/activationconfig/common"/>
-
-  <property name="ejb.jar.classes" 
-            value="
-com/sun/ts/tests/jms/ee20/ra/activationconfig/common/ActivationConfigBeanBase.class,
-com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectorauto/descriptor/ActivationConfigBean.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/TLogger.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/Constants.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/StatusReporter.class,
-com/sun/ts/tests/jms/common/JmsUtil.class
-            "/>
-  
-  <property name="appclient.jar.classes" 
-            value="
-com/sun/ts/lib/harness/EETest$Fault.class,
-com/sun/ts/lib/harness/EETest$SetupException.class,
-com/sun/ts/lib/harness/EETest.class,
-com/sun/ts/tests/jms/ee20/ra/activationconfig/common/QueueClientBase.class,
-com/sun/ts/tests/jms/ee20/ra/activationconfig/queue/selectordups/descriptor/Client.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/TLogger.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/QueueClientBase.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/Constants.class,
-com/sun/ts/tests/jms/commonee/Client.class
-            "/>
-    
-  <import file="../../../../../../../../../../../../src/com/sun/ts/tests/jms/ee20/ra/common/messaging/import.xml"/>  
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/build.xml
deleted file mode 100644
index e85452c1e4..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/build.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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 basedir="." default="usage" name="jms_ee20_ra_activationconfig_topic">
-  <import file="../../../../../../../../../../bin/xml/ts.nonleafimport.xml" />
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/noselnocidautodurable/annotated/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/noselnocidautodurable/annotated/build.xml
deleted file mode 100644
index c9fea75ffe..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/noselnocidautodurable/annotated/build.xml
+++ /dev/null
@@ -1,52 +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="jms_ee20_ra_activationconfig_topic_noselnocidautodurable_annotated" default="usage" basedir=".">
-  <property name="app.name" value="topic_noselnocidautodurable_annotated"/>
-  <property name="client" value="com.sun.ts.tests.jms.ee20.ra.activationconfig.topic.noselnocidautodurable.annotated.Client"/>
-  <property name="pkg.dir" value="com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/noselnocidautodurable/annotated"/>
-  <property name="app.common" value="com/sun/ts/tests/jms/ee20/ra/activationconfig/common"/>
-
-  <property name="ejb.jar.classes" 
-            value="
-com/sun/ts/tests/jms/ee20/ra/activationconfig/common/ActivationConfigBeanBase.class,
-com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/noselnocidautodurable/annotated/ActivationConfigBean.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/TLogger.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/Constants.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/StatusReporter.class,
-com/sun/ts/tests/jms/common/JmsUtil.class
-            "/>
-  
-  <property name="appclient.jar.classes" 
-            value="
-com/sun/ts/lib/harness/EETest$Fault.class,
-com/sun/ts/lib/harness/EETest$SetupException.class,
-com/sun/ts/lib/harness/EETest.class,
-com/sun/ts/tests/jms/ee20/ra/activationconfig/common/TopicClientBase.class,
-com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/noselnocidautodurable/annotated/Client.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/TLogger.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/QueueClientBase.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/Constants.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/TopicClientBase.class,
-com/sun/ts/tests/jms/commonee/Client.class
-            "/>
-    
-  <import file="../../../../../../../../../../../../src/com/sun/ts/tests/jms/ee20/ra/common/messaging/import.xml"/>  
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/noselnocidautodurable/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/noselnocidautodurable/build.xml
deleted file mode 100644
index c18afc61b0..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/noselnocidautodurable/build.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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 basedir="." default="usage" name="jms_ee20_ra_activationconfig_topic_noselnocidautodurable">
-  <import file="../../../../../../../../../../../bin/xml/ts.nonleafimport.xml" />
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/noselnocidautodurable/descriptor/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/noselnocidautodurable/descriptor/build.xml
deleted file mode 100644
index 5c0d50e9f3..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/noselnocidautodurable/descriptor/build.xml
+++ /dev/null
@@ -1,52 +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="jms_ee20_ra_activationconfig_topic_noselnocidautodurable_descriptor" default="usage" basedir=".">
-  <property name="app.name" value="topic_noselnocidautodurable_descriptor"/>
-  <property name="client" value="com.sun.ts.tests.jms.ee20.ra.activationconfig.topic.noselnocidautodurable.descriptor.Client"/>
-  <property name="pkg.dir" value="com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/noselnocidautodurable/descriptor"/>
-  <property name="app.common" value="com/sun/ts/tests/jms/ee20/ra/activationconfig/common"/>
-
-  <property name="ejb.jar.classes" 
-            value="
-com/sun/ts/tests/jms/ee20/ra/activationconfig/common/ActivationConfigBeanBase.class,
-com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/noselnocidautodurable/descriptor/ActivationConfigBean.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/TLogger.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/Constants.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/StatusReporter.class,
-com/sun/ts/tests/jms/common/JmsUtil.class
-            "/>
-  
-  <property name="appclient.jar.classes" 
-            value="
-com/sun/ts/lib/harness/EETest$Fault.class,
-com/sun/ts/lib/harness/EETest$SetupException.class,
-com/sun/ts/lib/harness/EETest.class,
-com/sun/ts/tests/jms/ee20/ra/activationconfig/common/TopicClientBase.class,
-com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/noselnocidautodurable/descriptor/Client.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/TLogger.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/QueueClientBase.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/Constants.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/TopicClientBase.class,
-com/sun/ts/tests/jms/commonee/Client.class
-            "/>
-    
-  <import file="../../../../../../../../../../../../src/com/sun/ts/tests/jms/ee20/ra/common/messaging/import.xml"/>  
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectorautociddurable/annotated/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectorautociddurable/annotated/build.xml
deleted file mode 100644
index be6751849c..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectorautociddurable/annotated/build.xml
+++ /dev/null
@@ -1,52 +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="jms_ee20_ra_activationconfig_topic_selectorautociddurable_annotated" default="usage" basedir=".">
-  <property name="app.name" value="topic_selectorautociddurable_annotated"/>
-  <property name="client" value="com.sun.ts.tests.jms.ee20.ra.activationconfig.topic.selectorautociddurable.annotated.Client"/>
-  <property name="pkg.dir" value="com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectorautociddurable/annotated"/>
-  <property name="app.common" value="com/sun/ts/tests/jms/ee20/ra/activationconfig/common"/>
-
-  <property name="ejb.jar.classes" 
-            value="
-com/sun/ts/tests/jms/ee20/ra/activationconfig/common/ActivationConfigBeanBase.class,
-com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectorautociddurable/annotated/ActivationConfigBean.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/TLogger.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/Constants.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/StatusReporter.class,
-com/sun/ts/tests/jms/common/JmsUtil.class
-            "/>
-  
-  <property name="appclient.jar.classes" 
-            value="
-com/sun/ts/lib/harness/EETest$Fault.class,
-com/sun/ts/lib/harness/EETest$SetupException.class,
-com/sun/ts/lib/harness/EETest.class,
-com/sun/ts/tests/jms/ee20/ra/activationconfig/common/TopicClientBase.class,
-com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectorautociddurable/annotated/Client.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/TLogger.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/QueueClientBase.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/Constants.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/TopicClientBase.class,
-com/sun/ts/tests/jms/commonee/Client.class
-            "/>
-    
-  <import file="../../../../../../../../../../../../src/com/sun/ts/tests/jms/ee20/ra/common/messaging/import.xml"/>  
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectorautociddurable/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectorautociddurable/build.xml
deleted file mode 100644
index 95050f8a7d..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectorautociddurable/build.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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 basedir="." default="usage" name="jms_ee20_ra_activationconfig_topic_selectorautocdidurable">
-  <import file="../../../../../../../../../../../bin/xml/ts.nonleafimport.xml" />
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectorautociddurable/descriptor/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectorautociddurable/descriptor/build.xml
deleted file mode 100644
index f9f7eacc84..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectorautociddurable/descriptor/build.xml
+++ /dev/null
@@ -1,52 +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="jms_ee20_ra_activationconfig_topic_selectorautociddurable_descriptor" default="usage" basedir=".">
-  <property name="app.name" value="topic_selectorautociddurable_descriptor"/>
-  <property name="client" value="com.sun.ts.tests.jms.ee20.ra.activationconfig.topic.selectorautociddurable.descriptor.Client"/>
-  <property name="pkg.dir" value="com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectorautociddurable/descriptor"/>
-  <property name="app.common" value="com/sun/ts/tests/jms/ee20/ra/activationconfig/common"/>
-
-  <property name="ejb.jar.classes" 
-            value="
-com/sun/ts/tests/jms/ee20/ra/activationconfig/common/ActivationConfigBeanBase.class,
-com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectorautociddurable/descriptor/ActivationConfigBean.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/TLogger.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/Constants.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/StatusReporter.class,
-com/sun/ts/tests/jms/common/JmsUtil.class
-            "/>
-  
-  <property name="appclient.jar.classes" 
-            value="
-com/sun/ts/lib/harness/EETest$Fault.class,
-com/sun/ts/lib/harness/EETest$SetupException.class,
-com/sun/ts/lib/harness/EETest.class,
-com/sun/ts/tests/jms/ee20/ra/activationconfig/common/TopicClientBase.class,
-com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectorautociddurable/descriptor/Client.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/TLogger.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/QueueClientBase.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/Constants.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/TopicClientBase.class,
-com/sun/ts/tests/jms/commonee/Client.class
-            "/>
-    
-  <import file="../../../../../../../../../../../../src/com/sun/ts/tests/jms/ee20/ra/common/messaging/import.xml"/>  
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectordupsnondurable/annotated/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectordupsnondurable/annotated/build.xml
deleted file mode 100644
index dcb2586080..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectordupsnondurable/annotated/build.xml
+++ /dev/null
@@ -1,52 +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="jms_ee20_ra_activationconfig_topic_selectordupsnondurable_annotated" default="usage" basedir=".">
-  <property name="app.name" value="topic_selectordupsnondurable_annotated"/>
-  <property name="client" value="com.sun.ts.tests.jms.ee20.ra.activationconfig.topic.selectordupsnondurable.annotated.Client"/>
-  <property name="pkg.dir" value="com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectordupsnondurable/annotated"/>
-  <property name="app.common" value="com/sun/ts/tests/jms/ee20/ra/activationconfig/common"/>
-
-  <property name="ejb.jar.classes" 
-            value="
-com/sun/ts/tests/jms/ee20/ra/activationconfig/common/ActivationConfigBeanBase.class,
-com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectordupsnondurable/annotated/ActivationConfigBean.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/TLogger.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/Constants.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/StatusReporter.class,
-com/sun/ts/tests/jms/common/JmsUtil.class
-            "/>
-  
-  <property name="appclient.jar.classes" 
-            value="
-com/sun/ts/lib/harness/EETest$Fault.class,
-com/sun/ts/lib/harness/EETest$SetupException.class,
-com/sun/ts/lib/harness/EETest.class,
-com/sun/ts/tests/jms/ee20/ra/activationconfig/common/TopicClientBase.class,
-com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectordupsnondurable/annotated/Client.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/TLogger.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/QueueClientBase.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/Constants.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/TopicClientBase.class,
-com/sun/ts/tests/jms/commonee/Client.class
-            "/>
-    
-  <import file="../../../../../../../../../../../../src/com/sun/ts/tests/jms/ee20/ra/common/messaging/import.xml"/>  
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectordupsnondurable/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectordupsnondurable/build.xml
deleted file mode 100644
index ed56ea6b0a..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectordupsnondurable/build.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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 basedir="." default="usage" name="jms_ee20_ra_activationconfig_topic_selectordupsnondurable">
-  <import file="../../../../../../../../../../../bin/xml/ts.nonleafimport.xml" />
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectordupsnondurable/descriptor/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectordupsnondurable/descriptor/build.xml
deleted file mode 100644
index 57448d309a..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectordupsnondurable/descriptor/build.xml
+++ /dev/null
@@ -1,52 +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="jms_ee20_ra_activationconfig_topic_selectordupsnondurable_descriptor" default="usage" basedir=".">
-  <property name="app.name" value="topic_selectordupsnondurable_descriptor"/>
-  <property name="client" value="com.sun.ts.tests.jms.ee20.ra.activationconfig.topic.selectordupsnondurable.descriptor.Client"/>
-  <property name="pkg.dir" value="com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectordupsnondurable/descriptor"/>
-  <property name="app.common" value="com/sun/ts/tests/jms/ee20/ra/activationconfig/common"/>
-
-  <property name="ejb.jar.classes" 
-            value="
-com/sun/ts/tests/jms/ee20/ra/activationconfig/common/ActivationConfigBeanBase.class,
-com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectordupsnondurable/descriptor/ActivationConfigBean.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/TLogger.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/Constants.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/StatusReporter.class,
-com/sun/ts/tests/jms/common/JmsUtil.class
-            "/>
-  
-  <property name="appclient.jar.classes" 
-            value="
-com/sun/ts/lib/harness/EETest$Fault.class,
-com/sun/ts/lib/harness/EETest$SetupException.class,
-com/sun/ts/lib/harness/EETest.class,
-com/sun/ts/tests/jms/ee20/ra/activationconfig/common/TopicClientBase.class,
-com/sun/ts/tests/jms/ee20/ra/activationconfig/topic/selectordupsnondurable/descriptor/Client.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/TLogger.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/QueueClientBase.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/Constants.class,
-com/sun/ts/tests/jms/ee20/ra/common/messaging/TopicClientBase.class,
-com/sun/ts/tests/jms/commonee/Client.class
-            "/>
-    
-  <import file="../../../../../../../../../../../../src/com/sun/ts/tests/jms/ee20/ra/common/messaging/import.xml"/>  
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/build.xml
deleted file mode 100644
index 719f4835e2..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/build.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_ee20_ra" basedir="." default="usage">
-    <import file="../../../../../../../../bin/xml/ts.nonleafimport.xml"/>   
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/common/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/common/build.xml
deleted file mode 100644
index bdf07ecc47..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/common/build.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_ee20_ra_common" basedir="." default="usage">
-    <import file="../../../../../../../../../bin/xml/ts.nonleafimport.xml"/>   
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/common/messaging/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/common/messaging/build.xml
deleted file mode 100644
index fe971fbf4f..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/ra/common/messaging/build.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_ee20_ra_common_messaging" basedir="." default="usage">
-    <import file="../../../../../../../../../../bin/xml/ts.import.xml"/>   
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/build.xml
deleted file mode 100644
index 2db00bfb42..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/build.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
-    Copyright (c) 2013, 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="jms_ee20_resourcedefs_annotations" basedir="." default="usage">
-<import file="../../../../../../../../../bin/xml/ts.import.xml"/>
-
-  <property name="current.dir" value="${basedir}"/>
-  <property name="app.name" value="resourcedefs_annotations"/>
-  <property name="dd.files.already.exist" value="true"/>
-
-  <target name="package" >
-      <ts.clientjar archivename="${app.name}" mainclass="com.sun.ts.tests.jms.ee20.resourcedefs.annotations.Client" excludedfiles="${pkg.dir}/ServletClient.class, ${pkg.dir}/EjbClient.class, ${pkg.dir}/MyBean.class">
-	<zipfileset dir="${class.dir}" includes="${pkg.dir}/Client.class, ${pkg.dir}/EjbClientIf.class"/>
-      </ts.clientjar>
-      <ts.ejbjar archivename="${app.name}" descriptor="${app.name}_ejb.xml" excludedfiles="${pkg.dir}/Client.class, ${pkg.dir}/ServletClient.class, ${pkg.dir}/MyBean.class">
-	<zipfileset dir="${class.dir}" includes="${pkg.dir}/EjbClientIF.class, ${pkg.dir}/EjbClient.class"/>
-      </ts.ejbjar>
-      <ts.war archivename="${app.name}" descriptor="${app.name}_web.xml" excludedfiles="${pkg.dir}/Client.class, ${pkg.dir}/EjbClient*.class">
-	<zipfileset dir="${class.dir}" includes="${pkg.dir}/ServletClient.class" prefix="WEB-INF/classes"/>
-	<zipfileset dir="." includes="JspClient.jsp, index.html"/>
-      </ts.war>
-      <copy file="application.xml.clientear" tofile="application.xml"/>
-      <ts.ear archivename="${app.name}" descriptordir="." descriptor="application.xml" includedefaultfiles="false">
-         <zipfileset dir="${dist.dir}/${pkg.dir}" includes="${app.name}_client.jar"/>
-         <zipfileset dir="${dist.dir}/${pkg.dir}" includes="${app.name}_web.war"/>
-         <zipfileset dir="${dist.dir}/${pkg.dir}" includes="${app.name}_ejb.jar"/>
-      </ts.ear>
-      <delete file="application.xml" />
-  </target>
-
-  <target name="do.token.substitution.of.java.src.files">
-    <copy failonerror="false" overwrite="true" 
-      file="${ts.home}/src/${pkg.dir}/files/Client.java.src"
-      tofile="${ts.home}/src/${pkg.dir}/Client.java">
-        <filterset>
-	  <filter token="raname" value="${jmsra.name}"/>
-	  <filter token="user" value="${user}"/>
-	  <filter token="password" value="${password}"/>
-        </filterset>
-    </copy>
-    <copy failonerror="false" overwrite="true" 
-      file="${ts.home}/src/${pkg.dir}/files/EjbClient.java.src"
-      tofile="${ts.home}/src/${pkg.dir}/EjbClient.java">
-        <filterset>
-	  <filter token="raname" value="${jmsra.name}"/>
-	  <filter token="user" value="${user}"/>
-	  <filter token="password" value="${password}"/>
-        </filterset>
-    </copy>
-    <copy failonerror="false" overwrite="true" 
-      file="${ts.home}/src/${pkg.dir}/files/ServletClient.java.src"
-      tofile="${ts.home}/src/${pkg.dir}/ServletClient.java">
-        <filterset>
-	  <filter token="raname" value="${jmsra.name}"/>
-	  <filter token="user" value="${user}"/>
-	  <filter token="password" value="${password}"/>
-        </filterset>
-    </copy>
-    <copy failonerror="false" overwrite="true" 
-      file="${ts.home}/src/${pkg.dir}/files/MyBean.java.src"
-      tofile="${ts.home}/src/${pkg.dir}/MyBean.java">
-        <filterset>
-	  <filter token="raname" value="${jmsra.name}"/>
-	  <filter token="user" value="${user}"/>
-	  <filter token="password" value="${password}"/>
-        </filterset>
-    </copy>
-  </target>
-
-  <target name="-precompile" depends="clean, do.token.substitution.of.java.src.files"/>
-
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/build.xml
deleted file mode 100644
index 71ead47c6f..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/build.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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="jms_ee20_resourcedefs" basedir="." default="usage">
-    <import file="../../../../../../../../bin/xml/ts.nonleafimport.xml"/>   
-</project>
diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/descriptor/build.xml b/jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/descriptor/build.xml
deleted file mode 100644
index f58868396d..0000000000
--- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/resourcedefs/descriptor/build.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2013, 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
-
--->
-
-<!--
-$Id$
--->
-<project name="jms_ee20_resourcedefs_descriptor" basedir="." default="usage">
-<import file="../../../../../../../../../bin/xml/ts.import.xml"/> 
-
-  <property name="includes"
-            value="com/sun/ts/tests/jms/common/JmsTool.class"/>
-
-  <target name="package">
-      <ts.vehicles name="resourcedefs_descriptor"> 
-        <ejb-elements>
-          <fileset dir="${class.dir}" includes="${includes}"/>
-        </ejb-elements>
-        <client-elements>
-          <fileset dir="${class.dir}" includes="${includes}"/>
-        </client-elements>
-        <servlet-elements>
-	  <zipfileset dir="${class.dir}" includes="${includes}"
-                      prefix="WEB-INF/classes"/>
-        </servlet-elements>
-        <jsp-elements>
-	  <zipfileset dir="${class.dir}" includes="${includes}"
-                      prefix="WEB-INF/classes"/>
-        </jsp-elements>
-      </ts.vehicles>
-  </target>
-
-  <target name="create.xml.files">
-    <copy failonerror="false" overwrite="true" 
-      file="${ts.home}/src/${pkg.dir}/xml/appclient_vehicle_client.xml"
-      tofile="${ts.home}/src/${pkg.dir}/appclient_vehicle_client.xml">
-        <filterset>
-	  <filter token="raname" value="${jmsra.name}"/>
-	  <filter token="user" value="${user}"/>
-	  <filter token="password" value="${password}"/>
-        </filterset>
-    </copy>
-    <copy failonerror="false" overwrite="true" 
-      file="${ts.home}/src/${pkg.dir}/xml/ejb_vehicle_ejb.xml"
-      tofile="${ts.home}/src/${pkg.dir}/ejb_vehicle_ejb.xml">
-        <filterset>
-	  <filter token="raname" value="${jmsra.name}"/>
-	  <filter token="user" value="${user}"/>
-	  <filter token="password" value="${password}"/>
-        </filterset>
-    </copy>
-    <copy failonerror="false" overwrite="true" 
-      file="${ts.home}/src/${pkg.dir}/xml/jsp_vehicle_web.xml"
-      tofile="${ts.home}/src/${pkg.dir}/jsp_vehicle_web.xml">
-        <filterset>
-	  <filter token="raname" value="${jmsra.name}"/>
-	  <filter token="user" value="${user}"/>
-	  <filter token="password" value="${password}"/>
-        </filterset>
-    </copy>
-    <copy failonerror="false" overwrite="true" 
-      file="${ts.home}/src/${pkg.dir}/xml/servlet_vehicle_web.xml"
-      tofile="${ts.home}/src/${pkg.dir}/servlet_vehicle_web.xml">
-        <filterset>
-	  <filter token="raname" value="${jmsra.name}"/>
-	  <filter token="user" value="${user}"/>
-	  <filter token="password" value="${password}"/>
-        </filterset>
-    </copy>
-  </target>
-
-  <target name="compile" depends="clean, create.xml.files">
-      <ts.javac includes="${pkg.dir}/**/*.java,
-                          com/sun/ts/tests/jms/common/**/*.java"/>
-  </target>
-
-  <target name="build" depends="clean, create.xml.files, TestImport.build"/>
-  
-  <target name="clean" >
-    <delete failonerror="false" file="${ts.home}/src/${pkg.dir}/appclient_vehicle_client.xml"/>
-    <delete failonerror="false" file="${ts.home}/src/${pkg.dir}/ejb_vehicle_ejb.xml"/>
-    <delete failonerror="false" file="${ts.home}/src/${pkg.dir}/jsp_vehicle_web.xml"/>
-    <delete failonerror="false" file="${ts.home}/src/${pkg.dir}/servlet_vehicle_web.xml"/>
-    <ts.clean/>
-  </target>
-
-</project>