copy tck jars to domain1/lib, inplace of domain1/lib/ext.

Signed-off-by: gurunandan.rao@oracle.com <gurunandan.rao@oracle.com>
gurunrao · Mar 2, 2021 · 1fb1c80 · 1fb1c80
1 parent 8cddfd7
commit 1fb1c80
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 18 deletions.
diff --git a/install/concurrency/bin/xml/impl/glassfish/config.vi.xml b/install/concurrency/bin/xml/impl/glassfish/config.vi.xml
@@ -152,8 +152,8 @@
     </target>
 
     <target name="copy.tck.jars">
-        <copy file="${ts.home}/lib/concurrencytck.jar" tofile="${webcontainer.home}/domains/domain1/lib/ext/concurrencytck.jar" overwrite="yes" />
-        <copy file="${ts.home}/lib/tsharness.jar" tofile="${webcontainer.home}/domains/domain1/lib/ext/tsharness.jar" overwrite="yes" />
+        <copy file="${ts.home}/lib/concurrencytck.jar" tofile="${webcontainer.home}/domains/domain1/lib/concurrencytck.jar" overwrite="yes" />
+        <copy file="${ts.home}/lib/tsharness.jar" tofile="${webcontainer.home}/domains/domain1/lib/tsharness.jar" overwrite="yes" />
     </target>
 
     <target name="delete.tck.jars">

diff --git a/install/connector/bin/xml/impl/glassfish/config.vi.xml b/install/connector/bin/xml/impl/glassfish/config.vi.xml
@@ -92,8 +92,8 @@
 
     <!-- this copies the connector jar files to the instance lib directory.  -->
     <target name="copy.connector.jars" >
-        <copy file="${ts.home}/lib/connector.jar" tofile="${connector.domain}/lib/ext/connector.jar" overwrite="yes" />
-        <copy file="${ts.home}/lib/tsharness.jar" tofile="${connector.domain}/lib/ext/tsharness.jar" overwrite="yes" />
+        <copy file="${ts.home}/lib/connector.jar" tofile="${connector.domain}/lib/connector.jar" overwrite="yes" />
+        <copy file="${ts.home}/lib/tsharness.jar" tofile="${connector.domain}/lib/tsharness.jar" overwrite="yes" />
     </target>
 
     <target name="delete.connector.jars" >

diff --git a/install/jaxrs/bin/xml/impl/glassfish/config.vi.xml b/install/jaxrs/bin/xml/impl/glassfish/config.vi.xml
@@ -161,8 +161,8 @@
     </target>
 
     <target name="copy.tck.jars">
-        <copy file="${ts.home}/lib/${tslib.name}.jar" tofile="${web.home}/domains/domain1/lib/ext/${tslib.name}.jar" overwrite="yes" />
-        <copy file="${ts.home}/lib/tsharness.jar" tofile="${web.home}/domains/domain1/lib/ext/tsharness.jar" overwrite="yes" />
+        <copy file="${ts.home}/lib/${tslib.name}.jar" tofile="${web.home}/domains/domain1/lib/${tslib.name}.jar" overwrite="yes" />
+        <copy file="${ts.home}/lib/tsharness.jar" tofile="${web.home}/domains/domain1/lib/tsharness.jar" overwrite="yes" />
     </target>
 
     <target name="delete.tck.jars">

diff --git a/install/jaxws/bin/xml/impl/glassfish/config.ri.xml b/install/jaxws/bin/xml/impl/glassfish/config.ri.xml
@@ -159,8 +159,8 @@
     </target>
 
     <target name="copy.tck.jars">
-        <copy file="${ts.home}/lib/jaxwstck.jar" tofile="${webcontainer.home.ri}/domains/domain1/lib/ext/jaxwstck.jar" overwrite="yes" />
-        <copy file="${ts.home}/lib/tsharness.jar" tofile="${webcontainer.home.ri}/domains/domain1/lib/ext/tsharness.jar" overwrite="yes" />
+        <copy file="${ts.home}/lib/jaxwstck.jar" tofile="${webcontainer.home.ri}/domains/domain1/lib/jaxwstck.jar" overwrite="yes" />
+        <copy file="${ts.home}/lib/tsharness.jar" tofile="${webcontainer.home.ri}/domains/domain1/lib/tsharness.jar" overwrite="yes" />
     </target>
 
     <target name="delete.tck.jars">

diff --git a/install/jaxws/bin/xml/impl/glassfish/config.vi.xml b/install/jaxws/bin/xml/impl/glassfish/config.vi.xml
@@ -158,8 +158,8 @@
     </target>
 
     <target name="copy.tck.jars">
-        <copy file="${ts.home}/lib/jaxwstck.jar" tofile="${webcontainer.home}/domains/domain1/lib/ext/jaxwstck.jar" overwrite="yes" />
-        <copy file="${ts.home}/lib/tsharness.jar" tofile="${webcontainer.home}/domains/domain1/lib/ext/tsharness.jar" overwrite="yes" />
+        <copy file="${ts.home}/lib/jaxwstck.jar" tofile="${webcontainer.home}/domains/domain1/lib/jaxwstck.jar" overwrite="yes" />
+        <copy file="${ts.home}/lib/tsharness.jar" tofile="${webcontainer.home}/domains/domain1/lib/tsharness.jar" overwrite="yes" />
     </target>
 
     <target name="delete.tck.jars">

diff --git a/install/jms/ra/xml/impl/glassfish/config.vi.xml b/install/jms/ra/xml/impl/glassfish/config.vi.xml
@@ -400,8 +400,8 @@
     </target>
 
     <target name="copy.tck.jars">
-        <copy file="${ts.home}/lib/jmstck.jar" tofile="${glassfish.home}/domains/domain1/lib/ext/jmstck.jar" overwrite="yes" />
-        <copy file="${ts.home}/lib/tsharness.jar" tofile="${glassfish.home}/domains/domain1/lib/ext/tsharness.jar" overwrite="yes" />
+        <copy file="${ts.home}/lib/jmstck.jar" tofile="${glassfish.home}/domains/domain1/lib/jmstck.jar" overwrite="yes" />
+        <copy file="${ts.home}/lib/tsharness.jar" tofile="${glassfish.home}/domains/domain1/lib/tsharness.jar" overwrite="yes" />
     </target>
 
     <target name="copy.jmsra.jarfile">

diff --git a/install/jsonb/bin/xml/impl/glassfish/config.vi.xml b/install/jsonb/bin/xml/impl/glassfish/config.vi.xml
@@ -132,8 +132,8 @@
     </target>
 
     <target name="copy.tck.jars">
-        <copy file="${ts.home}/lib/jsonbtck.jar" tofile="${web.home}/domains/domain1/lib/ext/jsonbtck.jar" overwrite="yes" />
-        <copy file="${ts.home}/lib/tsharness.jar" tofile="${web.home}/domains/domain1/lib/ext/tsharness.jar" overwrite="yes" />
+        <copy file="${ts.home}/lib/jsonbtck.jar" tofile="${web.home}/domains/domain1/lib/jsonbtck.jar" overwrite="yes" />
+        <copy file="${ts.home}/lib/tsharness.jar" tofile="${web.home}/domains/domain1/lib/tsharness.jar" overwrite="yes" />
     </target>
 
     <target name="delete.tck.jars">

diff --git a/install/saaj/bin/xml/impl/glassfish/config.vi.xml b/install/saaj/bin/xml/impl/glassfish/config.vi.xml
@@ -133,8 +133,8 @@
     </target>
 
     <target name="copy.tck.jars">
-        <copy file="${ts.home}/lib/saajtck.jar" tofile="${webcontainer.home}/domains/domain1/lib/ext/saajtck.jar" overwrite="yes" />
-        <copy file="${ts.home}/lib/tsharness.jar" tofile="${webcontainer.home}/domains/domain1/lib/ext/tsharness.jar" overwrite="yes" />
+        <copy file="${ts.home}/lib/saajtck.jar" tofile="${webcontainer.home}/domains/domain1/lib/saajtck.jar" overwrite="yes" />
+        <copy file="${ts.home}/lib/tsharness.jar" tofile="${webcontainer.home}/domains/domain1/lib/tsharness.jar" overwrite="yes" />
     </target>
 
     <target name="delete.tck.jars">

diff --git a/install/websocket/bin/xml/impl/glassfish/config.vi.xml b/install/websocket/bin/xml/impl/glassfish/config.vi.xml
@@ -158,8 +158,8 @@
     </target>
 
     <target name="copy.tck.jars">
-        <copy file="${ts.home}/lib/${tslib.name}.jar" tofile="${web.home}/domains/domain1/lib/ext/${tslib.name}.jar" overwrite="yes" />
-        <copy file="${ts.home}/lib/tsharness.jar" tofile="${web.home}/domains/domain1/lib/ext/tsharness.jar" overwrite="yes" />
+        <copy file="${ts.home}/lib/${tslib.name}.jar" tofile="${web.home}/domains/domain1/lib/${tslib.name}.jar" overwrite="yes" />
+        <copy file="${ts.home}/lib/tsharness.jar" tofile="${web.home}/domains/domain1/lib/tsharness.jar" overwrite="yes" />
     </target>
 
     <target name="delete.tck.jars">