diff --git a/appserver/tests/appserv-tests/cciblackbox-tx/pom.xml b/appserver/tests/appserv-tests/cciblackbox-tx/pom.xml
index cebf45e..00c35c4 100644
--- a/appserver/tests/appserv-tests/cciblackbox-tx/pom.xml
+++ b/appserver/tests/appserv-tests/cciblackbox-tx/pom.xml
@@ -27,6 +27,7 @@
         <version>6.2.5-SNAPSHOT</version>
     </parent>
 
+    <groupId>org.glassfish.main.tests.connectors</groupId>
     <artifactId>cciblackbox-tx</artifactId>
     <name>GlassFish Ant Tests - CCI BlackBox TX</name>
 
diff --git a/appserver/tests/appserv-tests/config.properties b/appserver/tests/appserv-tests/config.properties
index 9a8cb72..b8b9804 100644
--- a/appserver/tests/appserv-tests/config.properties
+++ b/appserver/tests/appserv-tests/config.properties
@@ -14,6 +14,8 @@
 # SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
 #
 
+gf.version=${env.GF_VERSION}
+bundles.dir=${env.WORKSPACE}/bundles
 
 admin.domain=domain1
 admin.domain.dir=${env.S1AS_HOME}/domains
diff --git a/appserver/tests/appserv-tests/config/properties.xml b/appserver/tests/appserv-tests/config/properties.xml
index a9f5aad..547ce79 100644
--- a/appserver/tests/appserv-tests/config/properties.xml
+++ b/appserver/tests/appserv-tests/config/properties.xml
@@ -104,12 +104,30 @@
     <property name="ssl.mutualauth.port.two" value="33921" />
     <property name="jmx.system.connector.port.two" value="38687" />
     <property name="cert.nickname" value="s1as" />
+
+    <copy
+        file="${env.MVN_REPOSITORY}/org/glassfish/main/tests/connectors/cciblackbox-tx/${gf.version}/cciblackbox-tx-${gf.version}.jar"
+        tofile="${bundles.dir}/cciblackbox-tx.jar" />
+    <copy
+        file="${env.MVN_REPOSITORY}/org/glassfish/main/tests/connectors/connectors-ra-redeploy-jars/${gf.version}/connectors-ra-redeploy-jars-${gf.version}.jar"
+        tofile="${bundles.dir}/connectors-ra-redeploy-jars.jar" />
+    <copy
+        file="${env.MVN_REPOSITORY}/org/glassfish/main/tests/connectors/connectors-ra-redeploy-rars/${gf.version}/connectors-ra-redeploy-rars-${gf.version}.rar"
+        tofile="${bundles.dir}/connectors-ra-redeploy-rars.rar" />
+    <copy
+        file="${env.MVN_REPOSITORY}/org/glassfish/main/tests/connectors/connectors-ra-redeploy-rars/${gf.version}/connectors-ra-redeploy-rars-${gf.version}-v2.rar"
+        tofile="${bundles.dir}/connectors-ra-redeploy-rars-v2.rar" />
+    <copy
+        file="${env.MVN_REPOSITORY}/org/glassfish/main/tests/connectors/connectors-ra-redeploy-rars/${gf.version}/connectors-ra-redeploy-rars-${gf.version}-nojar.rar"
+        tofile="${bundles.dir}/connectors-ra-redeploy-rars-nojar.rar" />
+    <copy
+        file="${env.MVN_REPOSITORY}/org/glassfish/main/tests/connectors/connectors-ra-redeploy-rars-xa/${gf.version}/connectors-ra-redeploy-rars-xa-${gf.version}.rar"
+        tofile="${bundles.dir}/connectors-ra-redeploy-rars-xa.rar" />
 </target>
 
 <target name="setS1ASclassPath" unless="s1as.classpath">
     <path id="s1as_classpath_jars">
         <fileset dir="${env.S1AS_HOME}/modules" includes="**/*.jar" />
-        <!-- fileset dir="${env.S1AS_HOME}/imq/lib" includes="*.jar"/ -->
     </path>
     <pathconvert pathsep=":" property="s1as.classpath" refid="s1as_classpath_jars" />
 </target>
diff --git a/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/build.properties b/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/build.properties
index 8868341..4219361 100755
--- a/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/build.properties
@@ -19,7 +19,6 @@
 
 <property name="module" value="connector"/>
 <property name="app.type" value="application"/>
-<property name="cciblackbox.path" value="${env.APS_HOME}/cciblackbox-tx/target/cciblackbox-tx.jar"/>
 <property name="appname" value="${module}-embedded-cci"/>
 <property name="application.xml" value="descriptor/application.xml"/>
 <property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/build.xml b/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/build.xml
index 7961579..ad8f743 100755
--- a/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/build.xml
@@ -33,234 +33,219 @@
    &run;
 
     <target name="all" depends="build,setup,deploy,run,undeploy,unsetup"/>
-    <target name="run-test" depends="build,deploy,run,undeploy"/>
+  <target name="run-test" depends="build,deploy,run,undeploy"/>
 
-    <target name="clean" depends="init-common">
-        <delete dir="${build.classes.dir}"/>
-        <delete dir="${assemble.dir}"/>
-        <delete dir="${assemble.dir}/rar"/>
-        <delete file="${assemble.dir}/${rarname}.rar"/>
-        <antcall target="create-dboutfile"/>
-    </target>
+  <target name="clean" depends="init-common">
+    <delete dir="${build.classes.dir}"/>
+    <delete dir="${assemble.dir}"/>
+    <delete dir="${assemble.dir}/rar"/>
+    <delete file="${assemble.dir}/${rarname}.rar"/>
+    <antcall target="create-dboutfile"/>
+  </target>
 
-    <target name="compile" depends="clean">
-        <antcall target="compile-cci">
-            <param name="src" value="ejb"/>
-        </antcall>
-        <antcall target="compile-cci">
-            <param name="src" value="client"/>
-        </antcall>
-    </target>
+  <target name="compile" depends="clean">
+    <antcall target="compile-cci">
+      <param name="src" value="ejb"/>
+    </antcall>
+    <antcall target="compile-cci">
+      <param name="src" value="client"/>
+    </antcall>
+  </target>
 
-    <target name="create-pool">
-                <antcall target="create-connector-connpool-common">
-                <param name="ra.name" value="connector-embedded-cciApp#cciblackbox-${tx.mode}"/>
-                <param name="connection.defname" value="jakarta.resource.cci.ConnectionFactory"/>
-                <param name="connector.conpool.name" value="EMBEDDED-CCI-CONNPOOL"/>
-                </antcall>
-    </target>
+  <target name="create-pool">
+    <antcall target="create-connector-connpool-common">
+      <param name="ra.name" value="connector-embedded-cciApp#cciblackbox-${tx.mode}"/>
+      <param name="connection.defname" value="jakarta.resource.cci.ConnectionFactory"/>
+      <param name="connector.conpool.name" value="EMBEDDED-CCI-CONNPOOL"/>
+    </antcall>
+  </target>
 
-    <target name="create-resource">
-                <antcall target="create-connector-resource-common">
-                <param name="connector.conpool.name" value="EMBEDDED-CCI-CONNPOOL"/>
-                <param name="connector.jndi.name" value="eis/EMBEDDEDCCIEIS"/>
-                </antcall>
-     </target>
+  <target name="create-resource">
+    <antcall target="create-connector-resource-common">
+      <param name="connector.conpool.name" value="EMBEDDED-CCI-CONNPOOL"/>
+      <param name="connector.jndi.name" value="eis/EMBEDDEDCCIEIS"/>
+    </antcall>
+  </target>
 
-    <target name="delete-pool">
-                <antcall target="delete-connector-connpool-common">
-                <param name="connector.conpool.name" value="EMBEDDED-CCI-CONNPOOL"/>
-                </antcall>
-     </target>
+  <target name="delete-pool">
+    <antcall target="delete-connector-connpool-common">
+      <param name="connector.conpool.name" value="EMBEDDED-CCI-CONNPOOL"/>
+    </antcall>
+  </target>
 
-     <target name="delete-resource">
-                <antcall target="delete-connector-resource-common">
-                <param name="connector.jndi.name" value="eis/EMBEDDEDCCIEIS"/>
-                </antcall>
-     </target>
+  <target name="delete-resource">
+    <antcall target="delete-connector-resource-common">
+      <param name="connector.jndi.name" value="eis/EMBEDDEDCCIEIS"/>
+    </antcall>
+  </target>
 
-    <!--
+  <!--
         Custom target for compilation with local libraries for connector
     -->
-    <target name="compile-cci" depends="init-common">
-      <mkdir dir="${build.classes.dir}"/>
-      <javac srcdir="${src}"
+  <target name="compile-cci" depends="init-common">
+    <mkdir dir="${build.classes.dir}"/>
+    <javac srcdir="${src}"
         destdir="${build.classes.dir}"
-        classpath="${s1astest.classpath}:${cciblackbox.path}"
+        classpath="${s1astest.classpath}:${bundles.dir}/cciblackbox-tx.jar"
         failonerror="true"/>
-    </target>
+  </target>
 
-    <target name="create-pb-proc" depends="init-common">
-        <jar destfile="${assemble.dir}/cci-pb-proc.jar" update="true"
+  <target name="create-pb-proc" depends="init-common">
+    <jar destfile="${assemble.dir}/cci-pb-proc.jar" update="true"
             includes="${build.classes.dir}/**/SampleExternalMethods.class"/>
-    </target>
+  </target>
 
-    <target name="build">
-                <antcall target="build-embedded-ear"/>
-    </target>
+  <target name="build">
+    <antcall target="build-embedded-ear"/>
+  </target>
 
-    <target name="package-embedded-ejb">
-        <antcall target="package-ejbjar-common">
-                <param name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
-                <param name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-                <param name="ejbjar.classes" value="**/*Local*.class, **/*Remote*.class, **/*Bean*.class" />
-                <param name="ejbjar.files" value="${build.classes.dir}"/>
-                <param name="ejb.jar" value="${assemble.dir}/cci-embedded-ejb.jar"/>
-        </antcall>
-    </target>
-
-    <target name="package-embedded-client">
-        <antcall target="package-appclientjar-common">
-                <param name="application-client.xml" value="descriptor/application-client.xml"/>
-                <param name="sun-application-client.xml" value="descriptor/sun-application-client.xml"/>
-                <param name="appclientjar.classes" value="**/*Local*.class,**/*Remote*.class,**/*Home*.class,**/*Client*.class"/>
-                <param name="appclientjar.files" value="${build.classes.dir}"/>
-                <param name="appclient.jar" value="${assemble.dir}/cci-embedded-client.jar"/>
-        </antcall>
-    </target>
-
-    <target name="build-embedded-ear" depends="compile">
-                <delete file="${assemble.dir}/connector-embeddedApp.ear"/>
-                <mkdir dir="${assemble.dir}"/>
-                <copy file="descriptor/application.xml" tofile="${assemble.dir}/application.xml"/>
-                <mkdir dir="${build.classes.dir}/META-INF"/>
-                <antcall target="package-embedded-ejb"/>
-                <antcall target="package-embedded-client"/>
-                <antcall target="package-rar"/>
-                <ear earfile="${assemble.dir}/${appname}App.ear"
-                        appxml="${assemble.dir}/application.xml">
-                <fileset dir="${assemble.dir}">
-                <include name="cci-embedded-ejb.jar"/>
-                <include name="cciblackbox-tx.rar"/>
-                <include name="cci-embedded-client.jar"/>
-                </fileset>
-                <fileset dir="${env.APS_HOME}/lib" includes="reporter.jar"/>
-                </ear>
-    </target>
-
-    <target name="deploy" depends="init-common">
-                <antcall target="deploy-common"/>
-                <!--
-                <antcall target="create-pool">
-                        <param name="tx.mode" value="tx"/>
-                </antcall>
-                <antcall target="create-resource">
-                        <param name="tx.mode" value="tx"/>
-                </antcall>
-                -->
-    </target>
-
-    <target name="undeploy">
-                <!--
-                <antcall target="delete-resource"/>
-                <antcall target="delete-pool"/>
-                -->
-                <antcall target="undeploy-common"/>
-    </target>
-
-
-    <target name="run" depends="init-common">
-    <antcall target="runclient-common">
-        <param name="appclient.application.args" value="Embedded"/>
+  <target name="package-embedded-ejb">
+    <antcall target="package-ejbjar-common">
+      <param name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
+      <param name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
+      <param name="ejbjar.classes" value="**/*Local*.class, **/*Remote*.class, **/*Bean*.class" />
+      <param name="ejbjar.files" value="${build.classes.dir}"/>
+      <param name="ejb.jar" value="${assemble.dir}/cci-embedded-ejb.jar"/>
     </antcall>
-    </target>
+  </target>
 
-    <target name="usage">
-        <antcall target="usage-common"/>
-    </target>
-
-<!-- ================================================================ -->
-<!-- Target to create the appclient jar file with custom classes-->
-<!-- ================================================================ -->
-<target name="appclient-jar" depends="init-common">
-       <property name="appclientjar.classes" value="**/*Local*.class,**/*Remote*.class,**/*Home*.class,**/*Client*.class"/>
+  <target name="package-embedded-client">
     <antcall target="package-appclientjar-common">
-       <param name="appclientjar.files"
-            value="${build.classes.dir}"/>
-        <param name="appclient.jar"
-            value="${assemble.dir}/${appname}-client.jar"/>
+      <param name="application-client.xml" value="descriptor/application-client.xml"/>
+      <param name="sun-application-client.xml" value="descriptor/sun-application-client.xml"/>
+      <param name="appclientjar.classes" value="**/*Local*.class,**/*Remote*.class,**/*Home*.class,**/*Client*.class"/>
+      <param name="appclientjar.files" value="${build.classes.dir}"/>
+      <param name="appclient.jar" value="${assemble.dir}/cci-embedded-client.jar"/>
     </antcall>
-</target>
+  </target>
 
-<!-- ======================================================= -->
-<!--                  JVM options                            -->
-<!-- ======================================================= -->
+  <target name="build-embedded-ear" depends="compile">
+    <delete file="${assemble.dir}/connector-embeddedApp.ear"/>
+    <mkdir dir="${assemble.dir}"/>
+    <copy file="descriptor/application.xml" tofile="${assemble.dir}/application.xml"/>
+    <mkdir dir="${build.classes.dir}/META-INF"/>
+    <antcall target="package-embedded-ejb"/>
+    <antcall target="package-embedded-client"/>
+    <antcall target="package-rar"/>
+    <ear earfile="${assemble.dir}/${appname}App.ear" appxml="${assemble.dir}/application.xml">
+      <fileset dir="${assemble.dir}">
+        <include name="cci-embedded-ejb.jar"/>
+        <include name="cciblackbox-tx.rar"/>
+        <include name="cci-embedded-client.jar"/>
+      </fileset>
+      <fileset dir="${env.APS_HOME}/lib" includes="reporter.jar"/>
+    </ear>
+  </target>
 
-<target name="create-JVM-options">
-      <exec executable="${ASADMIN}" failonerror="false">
-        <arg line="create-jvm-options"/>
-        <arg line="--user ${admin.user}"/>
-        <arg line="--passwordfile ${env.APS_HOME}/devtests/connector/config/password.txt"/>
-        <arg line="--host ${admin.host}"/>
-        <arg line="--port ${admin.port}"/>
-        <arg line=":-Djdbc.drivers=${jdbc.drivers}"/>
-      </exec>
-</target>
+  <target name="deploy" depends="init-common">
+    <antcall target="deploy-common"/>
+  </target>
 
-<target name="delete-JVM-options">
-      <exec executable="${ASADMIN}" failonerror="false">
-        <arg line="delete-jvm-options"/>
-        <arg line="--user ${admin.user}"/>
-        <arg line="--passwordfile ${env.APS_HOME}/devtests/connector/config/password.txt"/>
-        <arg line="--host ${admin.host}"/>
-        <arg line="--port ${admin.port}"/>
-        <arg line=":-Djdbc.drivers=${jdbc.drivers}"/>
-      </exec>
-</target>
+  <target name="undeploy">
+    <antcall target="undeploy-common"/>
+  </target>
 
-<target name="create-rar">
-        <copy file="descriptor/ra.xml" tofile="${assemble.dir}/rar/META-INF/ra.xml"/>
-        <copy file="descriptor/sun-ra.xml" tofile="${assemble.dir}/rar/META-INF/sun-ra.xml"/>
-        <copy file="${env.APS_HOME}/cciblackbox-tx/target/cciblackbox-tx.jar" tofile="${assemble.dir}/rar/cciblackbox-tx.jar"/>
-        <replace file="${assemble.dir}/rar/META-INF/ra.xml" token="DBURL" value="${db.url}"/>
-</target>
 
-<target name="package-rar" depends="init-common">
+  <target name="run" depends="init-common">
+    <antcall target="runclient-common">
+      <param name="appclient.application.args" value="Embedded"/>
+    </antcall>
+  </target>
+
+  <target name="usage">
+    <antcall target="usage-common"/>
+  </target>
+
+  <!-- ================================================================ -->
+  <!-- Target to create the appclient jar file with custom classes-->
+  <!-- ================================================================ -->
+  <target name="appclient-jar" depends="init-common">
+    <property name="appclientjar.classes" value="**/*Local*.class,**/*Remote*.class,**/*Home*.class,**/*Client*.class"/>
+    <antcall target="package-appclientjar-common">
+      <param name="appclientjar.files" value="${build.classes.dir}"/>
+      <param name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
+    </antcall>
+  </target>
+
+  <!-- ======================================================= -->
+  <!--                  JVM options                            -->
+  <!-- ======================================================= -->
+
+  <target name="create-JVM-options">
+    <exec executable="${ASADMIN}" failonerror="false">
+      <arg line="create-jvm-options"/>
+      <arg line="--user ${admin.user}"/>
+      <arg line="--passwordfile ${env.APS_HOME}/devtests/connector/config/password.txt"/>
+      <arg line="--host ${admin.host}"/>
+      <arg line="--port ${admin.port}"/>
+      <arg line=":-Djdbc.drivers=${jdbc.drivers}"/>
+    </exec>
+  </target>
+
+  <target name="delete-JVM-options">
+    <exec executable="${ASADMIN}" failonerror="false">
+      <arg line="delete-jvm-options"/>
+      <arg line="--user ${admin.user}"/>
+      <arg line="--passwordfile ${env.APS_HOME}/devtests/connector/config/password.txt"/>
+      <arg line="--host ${admin.host}"/>
+      <arg line="--port ${admin.port}"/>
+      <arg line=":-Djdbc.drivers=${jdbc.drivers}"/>
+    </exec>
+  </target>
+
+  <target name="create-rar">
+    <copy file="descriptor/ra.xml" tofile="${assemble.dir}/rar/META-INF/ra.xml"/>
+    <copy file="descriptor/sun-ra.xml" tofile="${assemble.dir}/rar/META-INF/sun-ra.xml"/>
+    <copy file="${bundles.dir}/cciblackbox-tx.jar" tofile="${assemble.dir}/rar/cciblackbox-tx.jar"/>
+    <replace file="${assemble.dir}/rar/META-INF/ra.xml" token="DBURL" value="${db.url}"/>
+  </target>
+
+  <target name="package-rar" depends="init-common">
     <mkdir dir="${assemble.dir}/rar"/>
     <mkdir dir="${assemble.dir}/rar/META-INF"/>
     <antcall target="create-rar"/>
     <jar destfile="${assemble.dir}/${rarname}.rar" update="true">
-        <fileset dir="${assemble.dir}/rar">
-        </fileset>
-        <metainf dir="${assemble.dir}/rar/META-INF">
-        </metainf>
+      <fileset dir="${assemble.dir}/rar">
+      </fileset>
+      <metainf dir="${assemble.dir}/rar/META-INF">
+      </metainf>
     </jar>
-</target>
+  </target>
 
 
-<!-- db setup -->
-<target name="create-sql">
-        <antcall target="execute-sql-common">
-                <param name="sql.file" value="sql/cci-pb.sql"/>
-        </antcall>
-</target>
+  <!-- db setup -->
+  <target name="create-sql">
+    <antcall target="execute-sql-common">
+      <param name="sql.file" value="sql/cci-pb.sql"/>
+    </antcall>
+  </target>
 
-<target name="drop-sql">
-        <antcall target="execute-sql-common">
-                <param name="sql.file" value="sql/cci-pb-drop.sql"/>
-        </antcall>
-</target>
+  <target name="drop-sql">
+    <antcall target="execute-sql-common">
+      <param name="sql.file" value="sql/cci-pb-drop.sql"/>
+    </antcall>
+  </target>
 
-<!-- Set classpath-suffix for pointbase -->
+  <!-- Set classpath-suffix for pointbase -->
 
 
-<!-- setup -->
-<target name="setup" depends="init-common">
-        <antcall target="drop-sql"/>
-        <antcall target="create-sql"/>
-</target>
+  <!-- setup -->
+  <target name="setup" depends="init-common">
+    <antcall target="drop-sql"/>
+    <antcall target="create-sql"/>
+  </target>
 
-<!-- unsetup -->
-<target name="unsetup" depends="init-common">
-        <antcall target="drop-sql"/>
-</target>
+  <!-- unsetup -->
+  <target name="unsetup" depends="init-common">
+    <antcall target="drop-sql"/>
+  </target>
 
-<target name="create-dboutfile" depends="init-common">
-        <mkdir dir="${build.classes.dir}"/>
-        <exec executable="touch">
-           <arg line="${build.classes.dir}/setupDBTables.out"/>
-        </exec>
-</target>
+  <target name="create-dboutfile" depends="init-common">
+    <mkdir dir="${build.classes.dir}"/>
+    <exec executable="touch">
+      <arg line="${build.classes.dir}/setupDBTables.out"/>
+    </exec>
+  </target>
 
 
 </project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/build.properties b/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/build.properties
index 1c16f40..62ec752 100755
--- a/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/build.properties
@@ -19,7 +19,6 @@
 
 <property name="module" value="connector"/>
 <property name="app.type" value="application"/>
-<property name="cciblackbox.path" value="${env.APS_HOME}/cciblackbox-tx/target/cciblackbox-tx.jar"/>
 <property name="appname" value="connector-cci"/>
 <property name="application.xml" value="descriptor/application.xml"/>
 <property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/build.xml b/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/build.xml
index 76c9549..004800a 100755
--- a/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/build.xml
@@ -33,237 +33,224 @@
 &run;
 
 <target name="all" depends="build,setup,deploy,run,undeploy,unsetup"/>
-<target name="run-dp-test" depends="build,setup,deploy-dp,run,undeploy-dp,unsetup"/>
-<target name="run-test" depends="build,deploy,run,undeploy"/>
+  <target name="run-dp-test" depends="build,setup,deploy-dp,run,undeploy-dp,unsetup"/>
+  <target name="run-test" depends="build,deploy,run,undeploy"/>
 
-<target name="clean" depends="init-common">
+  <target name="clean" depends="init-common">
     <delete dir="${build.classes.dir}"/>
     <delete dir="${assemble.dir}"/>
     <delete dir="${assemble.dir}/rar"/>
     <delete file="${assemble.dir}/${rarname}.rar"/>
     <antcall target="create-dboutfile"/>
-</target>
+  </target>
 
-<target name="compile" depends="clean">
+  <target name="compile" depends="clean">
     <antcall target="compile-cci">
-        <param name="src" value="ejb"/>
+      <param name="src" value="ejb"/>
     </antcall>
     <antcall target="compile-cci">
-        <param name="src" value="client"/>
+      <param name="src" value="client"/>
     </antcall>
-</target>
+  </target>
 
 
 <!--
 Custom target for compilation with local libraries for connector
 -->
-<target name="compile-cci" depends="init-common">
+  <target name="compile-cci" depends="init-common">
     <mkdir dir="${build.classes.dir}"/>
     <javac srcdir="${src}"
         destdir="${build.classes.dir}"
-        classpath="${s1astest.classpath}:${cciblackbox.path}"
+        classpath="${s1astest.classpath}:${bundles.dir}/cciblackbox-tx.jar"
         failonerror="true"/>
-</target>
+  </target>
 
-<target name="create-pb-proc" depends="init-common">
+  <target name="create-pb-proc" depends="init-common">
     <jar destfile="${assemble.dir}/cci-pb-proc.jar" update="true"
         includes="${build.classes.dir}/**/SampleExternalMethods.class"/>
-</target>
+  </target>
 
-<target name="build" depends="compile">
+  <target name="build" depends="compile">
     <antcall target="build-ear-common">
-        <param name="ejbjar.classes"
+      <param name="ejbjar.classes"
             value="**/*Local*.class, **/*Remote*.class, **/*Bean*.class"/>
-        <param name="appclientjar.classes"
+      <param name="appclientjar.classes"
             value="**/*Local*.class,**/*Remote*.class,**/*Home*.class,**/*Client*.class"/>
     </antcall>
-</target>
+  </target>
 
-<target name="deploy" depends="init-common">
+  <target name="deploy" depends="init-common">
     <antcall target="package-rar"/>
     <antcall target="deploy-rar">
-        <param name="tx.mode" value="tx"/>
+      <param name="tx.mode" value="tx"/>
     </antcall>
-<!--    <antcall target="create-pool">
-        <param name="tx.mode" value="tx"/>
-    </antcall>
-    <antcall target="create-resource">
-        <param name="tx.mode" value="tx"/>
-    </antcall>
--->
     <antcall target="deploy-common"/>
-</target>
+  </target>
 
-<target name="deploy-dp" depends="init-common">
+  <target name="deploy-dp" depends="init-common">
     <antcall target="create-pool">
-        <param name="tx.mode" value="tx"/>
+      <param name="tx.mode" value="tx"/>
     </antcall>
     <antcall target="create-resource">
-        <param name="tx.mode" value="tx"/>
+      <param name="tx.mode" value="tx"/>
     </antcall>
     <antcall target="deploy-common"/>
-</target>
+  </target>
 
-<target name="undeploy">
-<!--
-    <antcall target="delete-resource"/>
-    <antcall target="delete-pool"/>
--->
+  <target name="undeploy">
     <antcall target="undeploy-rar"/>
     <antcall target="undeploy-common"/>
-</target>
+  </target>
 
-<target name="undeploy-dp">
+  <target name="undeploy-dp">
     <antcall target="delete-resource"/>
     <antcall target="delete-pool"/>
     <antcall target="undeploy-common"/>
-</target>
+  </target>
 
-<target name="run" depends="init-common">
+  <target name="run" depends="init-common">
     <antcall target="runclient-common">
-        <param name="appclient.application.args" value="standalone"/>
+      <param name="appclient.application.args" value="standalone"/>
     </antcall>
-</target>
+  </target>
 
-<!-- setup -->
-<target name="setup" depends="init-common, build">
+  <!-- setup -->
+  <target name="setup" depends="init-common, build">
     <antcall target="drop-sql"/>
     <antcall target="create-sql"/>
-</target>
+  </target>
 
-<!-- unsetup -->
-<target name="unsetup" depends="init-common">
+  <!-- unsetup -->
+  <target name="unsetup" depends="init-common">
     <antcall target="drop-sql"/>
-</target>
+  </target>
 
-<target name="create-pool">
+  <target name="create-pool">
     <antcall target="create-connector-connpool-common">
-        <param name="ra.name" value="cciblackbox-${tx.mode}"/>
-        <param name="connection.defname"
+      <param name="ra.name" value="cciblackbox-${tx.mode}"/>
+      <param name="connection.defname"
             value="jakarta.resource.cci.ConnectionFactory"/>
-        <param name="connector.conpool.name" value="CCI-CONNPOOL"/>
+      <param name="connector.conpool.name" value="CCI-CONNPOOL"/>
     </antcall>
-</target>
+  </target>
 
-<target name="create-resource">
+  <target name="create-resource">
     <antcall target="create-connector-resource-common">
-        <param name="connector.conpool.name" value="CCI-CONNPOOL"/>
-        <param name="connector.jndi.name" value="eis/CCIEIS"/>
+      <param name="connector.conpool.name" value="CCI-CONNPOOL"/>
+      <param name="connector.jndi.name" value="eis/CCIEIS"/>
     </antcall>
-</target>
+  </target>
 
-<target name="delete-pool">
+  <target name="delete-pool">
     <antcall target="delete-connector-connpool-common">
-        <param name="connector.conpool.name" value="CCI-CONNPOOL"/>
+      <param name="connector.conpool.name" value="CCI-CONNPOOL"/>
     </antcall>
-</target>
+  </target>
 
-<target name="delete-resource">
+  <target name="delete-resource">
     <antcall target="delete-connector-resource-common">
-        <param name="connector.jndi.name" value="eis/CCIEIS"/>
+      <param name="connector.jndi.name" value="eis/CCIEIS"/>
     </antcall>
-</target>
+  </target>
 
-<target name="deploy-rar">
+  <target name="deploy-rar">
     <antcall target="deploy-rar-common">
-        <param name="rarfile"
-            value="${assemble.dir}/${rarname}.rar" />
+      <param name="rarfile" value="${assemble.dir}/${rarname}.rar" />
     </antcall>
-</target>
+  </target>
 
-<target name="undeploy-rar">
+  <target name="undeploy-rar">
     <antcall target="undeploy-rar-common">
-        <param name="undeployrar"
-            value="cciblackbox-tx" />
+      <param name="undeployrar" value="cciblackbox-tx" />
     </antcall>
-</target>
+  </target>
 
 
-<!-- create the appclient jar file with custom classes-->
-<target name="appclient-jar" depends="init-common">
+  <!-- create the appclient jar file with custom classes-->
+  <target name="appclient-jar" depends="init-common">
     <property name="appclientjar.classes"
         value="**/*Local*.class,**/*Remote*.class,**/*Home*.class,**/*Client*.class"/>
     <antcall target="package-appclientjar-common">
-        <param name="appclientjar.files"
+      <param name="appclientjar.files"
             value="${build.classes.dir}"/>
-        <param name="appclient.jar"
+      <param name="appclient.jar"
             value="${assemble.dir}/${appname}-client.jar"/>
     </antcall>
-</target>
+  </target>
 
-<!-- create/delete JVM options -->
-<target name="create-JVM-options">
+  <!-- create/delete JVM options -->
+  <target name="create-JVM-options">
     <exec executable="${ASADMIN}" failonerror="false">
-        <arg line="create-jvm-options"/>
-        <arg line="--user ${admin.user}"/>
-        <arg line="--passwordfile ${env.APS_HOME}/devtests/connector/config/password.txt"/>
-        <arg line="--host ${admin.host}"/>
-        <arg line="--port ${admin.port}"/>
-        <arg line=":-Djdbc.drivers=${jdbc.drivers}"/>
+      <arg line="create-jvm-options"/>
+      <arg line="--user ${admin.user}"/>
+      <arg line="--passwordfile ${env.APS_HOME}/devtests/connector/config/password.txt"/>
+      <arg line="--host ${admin.host}"/>
+      <arg line="--port ${admin.port}"/>
+      <arg line=":-Djdbc.drivers=${jdbc.drivers}"/>
     </exec>
-</target>
+  </target>
 
-<target name="delete-JVM-options">
+  <target name="delete-JVM-options">
     <exec executable="${ASADMIN}" failonerror="false">
-        <arg line="delete-jvm-options"/>
-        <arg line="--user ${admin.user}"/>
-        <arg line="--passwordfile ${env.APS_HOME}/devtests/connector/config/password.txt"/>
-        <arg line="--host ${admin.host}"/>
-        <arg line="--port ${admin.port}"/>
-        <arg line=":-Djdbc.drivers=${jdbc.drivers}"/>
+      <arg line="delete-jvm-options"/>
+      <arg line="--user ${admin.user}"/>
+      <arg line="--passwordfile ${env.APS_HOME}/devtests/connector/config/password.txt"/>
+      <arg line="--host ${admin.host}"/>
+      <arg line="--port ${admin.port}"/>
+      <arg line=":-Djdbc.drivers=${jdbc.drivers}"/>
     </exec>
-</target>
+  </target>
 
-<target name="create-rar">
+  <target name="create-rar">
     <copy file="descriptor/ra.xml"
         tofile="${assemble.dir}/rar/META-INF/ra.xml"/>
     <copy file="descriptor/sun-ra.xml"
         tofile="${assemble.dir}/rar/META-INF/sun-ra.xml"/>
-    <copy file="${env.APS_HOME}/cciblackbox-tx/target/cciblackbox-tx.jar"
+    <copy file="${bundles.dir}/cciblackbox-tx.jar"
         tofile="${assemble.dir}/rar/cciblackbox-tx.jar"/>
     <replace file="${assemble.dir}/rar/META-INF/ra.xml"
         token="DBURL" value="${db.url}"/>
-</target>
+  </target>
 
-<target name="package-rar" depends="init-common">
+  <target name="package-rar" depends="init-common">
     <mkdir dir="${assemble.dir}/rar"/>
     <mkdir dir="${assemble.dir}/rar/META-INF"/>
     <antcall target="create-rar"/>
     <jar destfile="${assemble.dir}/${rarname}.rar" update="true">
-        <fileset dir="${assemble.dir}/rar">
-        </fileset>
-        <metainf dir="${assemble.dir}/rar/META-INF">
-        </metainf>
+      <fileset dir="${assemble.dir}/rar">
+      </fileset>
+      <metainf dir="${assemble.dir}/rar/META-INF">
+      </metainf>
     </jar>
-</target>
+  </target>
 
 
 
 
-<!-- Set classpath-suffix for pointbase -->
+  <!-- Set classpath-suffix for pointbase -->
 
-<target name="create-dboutfile" depends="init-common">
+  <target name="create-dboutfile" depends="init-common">
     <mkdir dir="${build.classes.dir}"/>
     <exec executable="touch">
-        <arg line="${build.classes.dir}/setupDBTables.out"/>
+      <arg line="${build.classes.dir}/setupDBTables.out"/>
     </exec>
-</target>
+  </target>
 
-<!-- db setup -->
-<target name="create-sql" depends="init-common">
+  <!-- db setup -->
+  <target name="create-sql" depends="init-common">
     <antcall target="execute-sql-common">
-        <param name="sql.file" value="sql/cci-pb.sql"/>
+      <param name="sql.file" value="sql/cci-pb.sql"/>
     </antcall>
-</target>
+  </target>
 
-<target name="drop-sql" depends="init-common">
+  <target name="drop-sql" depends="init-common">
     <antcall target="execute-sql-common">
-        <param name="sql.file" value="sql/cci-pb-drop.sql"/>
+      <param name="sql.file" value="sql/cci-pb-drop.sql"/>
     </antcall>
-</target>
+  </target>
 
-<target name="usage">
+  <target name="usage">
     <antcall target="usage-common"/>
-</target>
+  </target>
 
 </project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/build.xml b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/build.xml
index 2796a5f..d0667d5 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/build.xml
@@ -151,7 +151,7 @@
     <echo message="common.xml: Compiling test source files" level="verbose"/>
     <javac srcdir="servlet"
          destdir="${build.classes.dir}"
-         classpath="${s1astest.classpath}:${env.APS_HOME}/connectors-ra-redeploy/jars/target/classes"
+         classpath="${s1astest.classpath}:${bundles.dir}/connectors-ra-redeploy-jars.jar"
          debug="on"
          failonerror="true"/>
   </target>
@@ -171,13 +171,12 @@
     <delete file="${assemble.dir}/${appname}.ear"/>
     <mkdir dir="${assemble.dir}"/>
     <mkdir dir="${build.classes.dir}/META-INF"/>
-    <ear earfile="${assemble.dir}/${appname}App.ear"
-     appxml="${application.xml}">
+    <ear earfile="${assemble.dir}/${appname}App.ear" appxml="${application.xml}">
       <fileset dir="${assemble.dir}">
         <include name="*.jar"/>
         <include name="*.war"/>
       </fileset>
-      <fileset dir="${env.APS_HOME}/connectors-ra-redeploy/rars/target">
+      <fileset dir="${bundles.dir}">
         <include name="connectors-ra-redeploy-rars.rar"/>
       </fileset>
     </ear>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/build.properties
index 9a5b7df..e0cdf29 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/build.properties
@@ -19,7 +19,6 @@
 
 <property name="module" value="connector"/>
 <property name="app.type" value="application"/>
-<property name="cciblackbox.path" value="${env.APS_HOME}/cciblackbox-tx/target/cciblackbox-tx.jar"/>
 <property name="appname" value="${module}-embedded-cci"/>
 <property name="application.xml" value="descriptor/application.xml"/>
 <property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/build.xml
index 7f6d290..43e5c9b 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/build.xml
@@ -18,11 +18,11 @@
 
 -->
 
-        <!ENTITY commonSetup SYSTEM "./../../../../../config/properties.xml">
-        <!ENTITY commonBuild SYSTEM "./../../../../../config/common.xml">
-        <!ENTITY run SYSTEM "./../../../../../config/run.xml">
-        <!ENTITY testProperties SYSTEM "./build.properties">
-        ]>
+<!ENTITY commonSetup SYSTEM "./../../../../../config/properties.xml">
+<!ENTITY commonBuild SYSTEM "./../../../../../config/common.xml">
+<!ENTITY run SYSTEM "./../../../../../config/run.xml">
+<!ENTITY testProperties SYSTEM "./build.properties">
+]>
 
 
 <project name="cci" basedir="." default="usage">
@@ -32,302 +32,250 @@
     &testProperties;
     &run;
 
-    <target name="all" depends="build,setup,deploy,run,undeploy,unsetup"/>
-    <target name="run-test" depends="build,deploy,run,undeploy"/>
+  <target name="all" depends="build,setup,deploy,run,undeploy,unsetup" />
+  <target name="run-test" depends="build,deploy,run,undeploy" />
 
-    <target name="clean" depends="init-common">
-        <delete dir="${build.classes.dir}"/>
-        <delete dir="${assemble.dir}"/>
-        <delete dir="${assemble.dir}/rar"/>
-        <delete file="${assemble.dir}/${rarname}.rar"/>
-        <antcall target="create-dboutfile"/>
-    </target>
+  <target name="clean" depends="init-common">
+    <delete dir="${build.classes.dir}" />
+    <delete dir="${assemble.dir}" />
+    <delete dir="${assemble.dir}/rar" />
+    <delete file="${assemble.dir}/${rarname}.rar" />
+    <antcall target="create-dboutfile" />
+  </target>
 
-    <target name="compile" depends="clean">
-        <antcall target="compile-cci">
-            <param name="src" value="ejb"/>
-        </antcall>
-        <antcall target="compile-cci">
-            <param name="src" value="client"/>
-        </antcall>
+  <target name="compile" depends="clean">
+    <antcall target="compile-cci">
+      <param name="src" value="ejb" />
+    </antcall>
+    <antcall target="compile-cci">
+      <param name="src" value="client" />
+    </antcall>
 
 
-        <antcall target="compile-cci">
-            <param name="src" value="servlet"/>
-        </antcall>
+    <antcall target="compile-cci">
+      <param name="src" value="servlet" />
+    </antcall>
+    <javac srcdir="."
+           classpath="${env.APS_HOME}/lib/reporter.jar"
+           includes="client/WebTest.java"
+           destdir="."
+    />
+  </target>
 
+  <target name="create-pool">
+    <antcall target="create-connector-connpool-common">
+      <param name="ra.name" value="connector-embedded-cciApp#cciblackbox-${tx.mode}" />
+      <param name="connection.defname" value="jakarta.resource.cci.ConnectionFactory" />
+      <param name="connector.conpool.name" value="EMBEDDED-CCI-CONNPOOL" />
+    </antcall>
+  </target>
 
-        <javac
-                srcdir="."
-                classpath="${env.APS_HOME}/lib/reporter.jar"
-                includes="client/WebTest.java" destdir="."/>
+  <target name="create-resource">
+    <antcall target="create-connector-resource-common">
+      <param name="connector.conpool.name" value="EMBEDDED-CCI-CONNPOOL" />
+      <param name="connector.jndi.name" value="eis/EMBEDDEDCCIEIS" />
+    </antcall>
+  </target>
 
+  <target name="delete-pool">
+    <antcall target="delete-connector-connpool-common">
+      <param name="connector.conpool.name" value="EMBEDDED-CCI-CONNPOOL" />
+    </antcall>
+  </target>
 
-    </target>
+  <target name="delete-resource">
+    <antcall target="delete-connector-resource-common">
+      <param name="connector.jndi.name" value="eis/EMBEDDEDCCIEIS" />
+    </antcall>
+  </target>
 
-    <target name="create-pool">
-        <antcall target="create-connector-connpool-common">
-            <param name="ra.name" value="connector-embedded-cciApp#cciblackbox-${tx.mode}"/>
-            <param name="connection.defname" value="jakarta.resource.cci.ConnectionFactory"/>
-            <param name="connector.conpool.name" value="EMBEDDED-CCI-CONNPOOL"/>
-        </antcall>
-    </target>
-
-    <target name="create-resource">
-        <antcall target="create-connector-resource-common">
-            <param name="connector.conpool.name" value="EMBEDDED-CCI-CONNPOOL"/>
-            <param name="connector.jndi.name" value="eis/EMBEDDEDCCIEIS"/>
-        </antcall>
-    </target>
-
-    <target name="delete-pool">
-        <antcall target="delete-connector-connpool-common">
-            <param name="connector.conpool.name" value="EMBEDDED-CCI-CONNPOOL"/>
-        </antcall>
-    </target>
-
-    <target name="delete-resource">
-        <antcall target="delete-connector-resource-common">
-            <param name="connector.jndi.name" value="eis/EMBEDDEDCCIEIS"/>
-        </antcall>
-    </target>
-
-    <!--
+  <!--
         Custom target for compilation with local libraries for connector
     -->
-    <target name="compile-cci" depends="init-common">
-        <mkdir dir="${build.classes.dir}"/>
-        <javac srcdir="${src}"
-               destdir="${build.classes.dir}"
-               classpath="${s1astest.classpath}:${cciblackbox.path}"
-               failonerror="true"/>
-    </target>
+  <target name="compile-cci" depends="init-common">
+    <mkdir dir="${build.classes.dir}" />
+    <javac srcdir="${src}"
+           destdir="${build.classes.dir}"
+           classpath="${s1astest.classpath}:${bundles.dir}/cciblackbox-tx.jar"
+           failonerror="true"
+    />
+  </target>
 
-    <target name="create-pb-proc" depends="init-common">
+  <target name="create-pb-proc" depends="init-common">
+    <jar destfile="${build.classes.dir}/cci-pb-proc.jar"
+         update="true"
+         includes="${build.classes.dir}/client/*SampleExternalMethods.class*"
+    />
+  </target>
 
-        <jar destfile="${build.classes.dir}/cci-pb-proc.jar" update="true"
-             includes="${build.classes.dir}/client/*SampleExternalMethods.class*"/>
+  <target name="build">
+    <antcall target="build-embedded-ear" />
+  </target>
 
 
-        <!--
-            <jar jarfile="${build.classes.dir}/cci-pb-proc.jar" update="true">
-               <fileset dir="${build.classes.dir}" casesensitive="yes">
-                 <include name="**/SampleExternalMethods.class*"/>
-                   <exclude  name="**/ejb/*"/>
-                   <exclude  name="**/servlet/*"/>
-                   <exclude  name="**/connector/*"/>
-               </fileset>
-            </jar>
-        -->
+  <target name="package-embedded-ejb">
+    <antcall target="package-ejbjar-common">
+      <param name="ejb-jar.xml" value="descriptor/ejb-jar.xml" />
+      <param name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml" />
+      <param name="ejbjar.classes" value="**/*Local*.class, **/*Remote*.class, **/*Bean*.class" />
+      <param name="ejbjar.files" value="${build.classes.dir}" />
+      <param name="ejb.jar" value="${assemble.dir}/cci-embedded-ejb.jar" />
+    </antcall>
+  </target>
 
-    </target>
+  <target name="build-embedded-ear" depends="compile">
+    <delete file="${assemble.dir}/connector-embeddedApp.ear" />
+    <mkdir dir="${assemble.dir}" />
+    <copy file="descriptor/application.xml" tofile="${assemble.dir}/application.xml" />
+    <mkdir dir="${build.classes.dir}/META-INF" />
+    <antcall target="package-embedded-ejb" />
+    <antcall target="package-rar" />
 
-    <target name="build">
-        <antcall target="build-embedded-ear"/>
-    </target>
+    <antcall target="webclient-war-common">
+      <param name="hasWebclient" value="yes" />
+      <param name="appname" value="cci-embedded" />
+      <param name="web.xml" value="descriptor/web.xml" />
+      <param name="sun-web.xml" value="descriptor/sun-web.xml" />
+      <param name="webclient.war.classes" value="servlet/*.class, beans/*.class" />
+    </antcall>
 
 
-    <target name="package-embedded-ejb">
-        <antcall target="package-ejbjar-common">
-            <param name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
-            <param name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-            <param name="ejbjar.classes" value="**/*Local*.class, **/*Remote*.class, **/*Bean*.class"/>
-            <param name="ejbjar.files" value="${build.classes.dir}"/>
-            <param name="ejb.jar" value="${assemble.dir}/cci-embedded-ejb.jar"/>
-        </antcall>
-    </target>
+    <ear earfile="${assemble.dir}/${appname}App.ear" appxml="${assemble.dir}/application.xml">
+      <fileset dir="${assemble.dir}">
+        <include name="cci-embedded-ejb.jar" />
+        <include name="cciblackbox-tx.rar" />
+        <include name="cci-embedded-client.jar" />
+        <include name="cci-embedded-web.war" />
+      </fileset>
+      <fileset dir="${env.APS_HOME}/lib" includes="reporter.jar" />
+    </ear>
+  </target>
 
-    <!--
-        <target name="package-embedded-client">
-            <antcall target="package-appclientjar-common">
-                    <param name="application-client.xml" value="descriptor/application-client.xml"/>
-                    <param name="sun-application-client.xml" value="descriptor/sun-application-client.xml"/>
-                    <param name="appclientjar.classes" value="**/*Local*.class,**/*Remote*.class,**/*Home*.class,**/*Client*.class"/>
-                    <param name="appclientjar.files" value="${build.classes.dir}"/>
-                    <param name="appclient.jar" value="${assemble.dir}/cci-embedded-client.jar"/>
-            </antcall>
-        </target>
-    -->
+  <target name="deploy" depends="init-common">
+    <antcall target="deploy-common" />
+  </target>
 
-    <target name="build-embedded-ear" depends="compile">
-        <delete file="${assemble.dir}/connector-embeddedApp.ear"/>
-        <mkdir dir="${assemble.dir}"/>
-        <copy file="descriptor/application.xml" tofile="${assemble.dir}/application.xml"/>
-        <mkdir dir="${build.classes.dir}/META-INF"/>
-        <antcall target="package-embedded-ejb"/>
-        <!--
-                <antcall target="package-embedded-client"/>
-        -->
-
-        <antcall target="package-rar"/>
-
-        <antcall target="webclient-war-common">
-            <param name="hasWebclient" value="yes"/>
-            <param name="appname" value="cci-embedded"/>
-            <param name="web.xml" value="descriptor/web.xml"/>
-            <param name="sun-web.xml" value="descriptor/sun-web.xml"/>
-            <param name="webclient.war.classes" value="servlet/*.class, beans/*.class"/>
-        </antcall>
+  <target name="undeploy">
+    <antcall target="undeploy-common" />
+  </target>
 
 
-        <ear earfile="${assemble.dir}/${appname}App.ear"
-             appxml="${assemble.dir}/application.xml">
-            <fileset dir="${assemble.dir}">
-                <include name="cci-embedded-ejb.jar"/>
-                <include name="cciblackbox-tx.rar"/>
-                <include name="cci-embedded-client.jar"/>
-                <!--<include name="cci-embedded-client.jar"/>-->
-                <include name="cci-embedded-web.war"/>
-            </fileset>
-            <fileset dir="${env.APS_HOME}/lib" includes="reporter.jar"/>
-        </ear>
-    </target>
+  <target name="run" depends="init-common">
+    <java classname="client.WebTest">
+      <arg value="${http.host}" />
+      <arg value="${http.port}" />
+      <arg value="${contextroot}" />
+      <arg value=" 1 " />
+      <classpath>
+        <pathelement location="${env.APS_HOME}/lib/reporter.jar" />
+        <pathelement location="." />
+      </classpath>
+    </java>
 
-    <target name="deploy" depends="init-common">
-        <antcall target="deploy-common"/>
-        <!--
-          <antcall target="create-pool">
-                          <param name="tx.mode" value="tx"/>
-                  </antcall>
-                  <antcall target="create-resource">
-                          <param name="tx.mode" value="tx"/>
-                  </antcall>
-          -->
-        <!--<antcall target="reconfig-common"/>-->
-    </target>
+  </target>
 
-    <target name="undeploy">
-        <!--
-          <antcall target="delete-resource"/>
-                  <antcall target="delete-pool"/>
-          -->
-        <antcall target="undeploy-common"/>
-        <!--<antcall target="reconfig-common"/>-->
-    </target>
+  <target name="usage">
+    <antcall target="usage-common" />
+  </target>
+
+  <!-- ================================================================ -->
+  <!-- Target to create the appclient jar file with custom classes-->
+  <!-- ================================================================ -->
+  <target name="appclient-jar" depends="init-common">
+    <property name="appclientjar.classes"
+              value="**/*Local*.class,**/*Remote*.class,**/*Home*.class,**/*Client*.class"
+    />
+    <antcall target="package-appclientjar-common">
+      <param name="appclientjar.files" value="${build.classes.dir}" />
+      <param name="appclient.jar" value="${assemble.dir}/${appname}-client.jar" />
+    </antcall>
+  </target>
+
+  <!-- ======================================================= -->
+  <!--                  JVM options                            -->
+  <!-- ======================================================= -->
+
+  <target name="create-JVM-options">
+    <exec executable="${ASADMIN}" failonerror="false">
+      <arg line="create-jvm-options" />
+      <arg line="--user ${admin.user}" />
+      <arg line="--passwordfile ${env.APS_HOME}/devtests/connector/config/password.txt" />
+      <arg line="--host ${admin.host}" />
+      <arg line="--port ${admin.port}" />
+      <arg line=":-Djdbc.drivers=${jdbc.drivers}" />
+    </exec>
+    <!--<antcall target="reconfig-common" />-->
+  </target>
+
+  <target name="delete-JVM-options">
+    <exec executable="${ASADMIN}" failonerror="false">
+      <arg line="delete-jvm-options" />
+      <arg line="--user ${admin.user}" />
+      <arg line="--passwordfile ${env.APS_HOME}/devtests/connector/config/password.txt" />
+      <arg line="--host ${admin.host}" />
+      <arg line="--port ${admin.port}" />
+      <arg line=":-Djdbc.drivers=${jdbc.drivers}" />
+    </exec>
+    <!--<antcall target="reconfig-common" />-->
+  </target>
+
+  <target name="create-rar">
+    <copy file="descriptor/ra.xml" tofile="${assemble.dir}/rar/META-INF/ra.xml" />
+    <copy file="descriptor/sun-ra.xml" tofile="${assemble.dir}/rar/META-INF/sun-ra.xml" />
+    <copy file="${bundles.dir}/cciblackbox-tx.jar" tofile="${assemble.dir}/rar/cciblackbox-tx.jar"
+    />
+    <copy file="${env.APS_HOME}/sqetests/connector/lib/cci-derby-proc.jar"
+          tofile="${assemble.dir}/rar/cci-derby-proc.jar"
+    />
+    <replace file="${assemble.dir}/rar/META-INF/ra.xml" token="DBURL" value="${db.url}" />
+  </target>
+
+  <target name="package-rar" depends="init-common">
+    <mkdir dir="${assemble.dir}/rar" />
+    <mkdir dir="${assemble.dir}/rar/META-INF" />
+    <antcall target="create-rar" />
+    <jar destfile="${assemble.dir}/${rarname}.rar" update="true">
+      <fileset dir="${assemble.dir}/rar">
+      </fileset>
+      <metainf dir="${assemble.dir}/rar/META-INF">
+      </metainf>
+    </jar>
+  </target>
 
 
-    <target name="run" depends="init-common">
-        <!--
-            <antcall target="runclient-common">
-            <param name="appclient.application.args" value="Embedded"/>
-            </antcall>
-        -->
+  <!-- db setup -->
+  <target name="create-sql">
+    <antcall target="execute-sql-common">
+      <param name="sql.file" value="sql/cci-pb.sql" />
+    </antcall>
+  </target>
 
-        <java classname="client.WebTest">
-            <arg value="${http.host}"/>
-            <arg value="${http.port}"/>
-            <arg value="${contextroot}"/>
-            <arg value=" 1 "/>
-            <classpath>
-                <pathelement location="${env.APS_HOME}/lib/reporter.jar"/>
-                <pathelement location="."/>
-            </classpath>
-        </java>
+  <target name="drop-sql">
+    <antcall target="execute-sql-common">
+      <param name="sql.file" value="sql/cci-pb-drop.sql" />
+    </antcall>
+  </target>
 
-    </target>
-
-    <target name="usage">
-        <antcall target="usage-common"/>
-    </target>
-
-    <!-- ================================================================ -->
-    <!-- Target to create the appclient jar file with custom classes-->
-    <!-- ================================================================ -->
-    <target name="appclient-jar" depends="init-common">
-        <property name="appclientjar.classes"
-                  value="**/*Local*.class,**/*Remote*.class,**/*Home*.class,**/*Client*.class"/>
-        <antcall target="package-appclientjar-common">
-            <param name="appclientjar.files"
-                   value="${build.classes.dir}"/>
-            <param name="appclient.jar"
-                   value="${assemble.dir}/${appname}-client.jar"/>
-        </antcall>
-    </target>
-
-    <!-- ======================================================= -->
-    <!--                  JVM options                            -->
-    <!-- ======================================================= -->
-
-    <target name="create-JVM-options">
-        <exec executable="${ASADMIN}" failonerror="false">
-            <arg line="create-jvm-options"/>
-            <arg line="--user ${admin.user}"/>
-            <arg line="--passwordfile ${env.APS_HOME}/devtests/connector/config/password.txt"/>
-            <arg line="--host ${admin.host}"/>
-            <arg line="--port ${admin.port}"/>
-            <arg line=":-Djdbc.drivers=${jdbc.drivers}"/>
-        </exec>
-        <!--<antcall target="reconfig-common" />-->
-    </target>
-
-    <target name="delete-JVM-options">
-        <exec executable="${ASADMIN}" failonerror="false">
-            <arg line="delete-jvm-options"/>
-            <arg line="--user ${admin.user}"/>
-            <arg line="--passwordfile ${env.APS_HOME}/devtests/connector/config/password.txt"/>
-            <arg line="--host ${admin.host}"/>
-            <arg line="--port ${admin.port}"/>
-            <arg line=":-Djdbc.drivers=${jdbc.drivers}"/>
-        </exec>
-        <!--<antcall target="reconfig-common" />-->
-    </target>
-
-    <target name="create-rar">
-        <copy file="descriptor/ra.xml" tofile="${assemble.dir}/rar/META-INF/ra.xml"/>
-        <copy file="descriptor/sun-ra.xml" tofile="${assemble.dir}/rar/META-INF/sun-ra.xml"/>
-        <copy file="${env.APS_HOME}/cciblackbox-tx/target/cciblackbox-tx.jar"
-              tofile="${assemble.dir}/rar/cciblackbox-tx.jar"/>
-        <copy file="${env.APS_HOME}/sqetests/connector/lib/cci-derby-proc.jar"
-              tofile="${assemble.dir}/rar/cci-derby-proc.jar"/>
-        <replace file="${assemble.dir}/rar/META-INF/ra.xml" token="DBURL" value="${db.url}"/>
-    </target>
-
-    <target name="package-rar" depends="init-common">
-        <mkdir dir="${assemble.dir}/rar"/>
-        <mkdir dir="${assemble.dir}/rar/META-INF"/>
-        <antcall target="create-rar"/>
-        <jar destfile="${assemble.dir}/${rarname}.rar" update="true">
-            <fileset dir="${assemble.dir}/rar">
-            </fileset>
-            <metainf dir="${assemble.dir}/rar/META-INF">
-            </metainf>
-        </jar>
-    </target>
+  <!-- Set classpath-suffix for pointbase -->
 
 
-    <!-- db setup -->
-    <target name="create-sql">
-        <antcall target="execute-sql-common">
-            <param name="sql.file" value="sql/cci-pb.sql"/>
-        </antcall>
-    </target>
+  <!-- setup -->
+  <target name="setup" depends="init-common">
+    <antcall target="drop-sql" />
+    <antcall target="create-sql" />
+  </target>
 
-    <target name="drop-sql">
-        <antcall target="execute-sql-common">
-            <param name="sql.file" value="sql/cci-pb-drop.sql"/>
-        </antcall>
-    </target>
+  <!-- unsetup -->
+  <target name="unsetup" depends="init-common">
+    <antcall target="drop-sql" />
+  </target>
 
-    <!-- Set classpath-suffix for pointbase -->
-
-
-    <!-- setup -->
-    <target name="setup" depends="init-common">
-        <antcall target="drop-sql"/>
-        <antcall target="create-sql"/>
-    </target>
-
-    <!-- unsetup -->
-    <target name="unsetup" depends="init-common">
-        <antcall target="drop-sql"/>
-    </target>
-
-    <target name="create-dboutfile" depends="init-common">
-        <mkdir dir="${build.classes.dir}"/>
-        <exec executable="touch">
-            <arg line="${build.classes.dir}/setupDBTables.out"/>
-        </exec>
-    </target>
+  <target name="create-dboutfile" depends="init-common">
+    <mkdir dir="${build.classes.dir}" />
+    <exec executable="touch">
+      <arg line="${build.classes.dir}/setupDBTables.out" />
+    </exec>
+  </target>
 
 
 </project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/build.properties
index d51f9ca..5511b00 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/build.properties
@@ -19,7 +19,6 @@
 
 <property name="module" value="connector"/>
 <property name="app.type" value="application"/>
-<property name="cciblackbox.path" value="${env.APS_HOME}/cciblackbox-tx/target/cciblackbox-tx.jar"/>
 <property name="appname" value="connector-cci"/>
 <property name="application.xml" value="descriptor/application.xml"/>
 <property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/build.xml
index e4c6695..2d1fa9f 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/build.xml
@@ -18,11 +18,11 @@
 
 -->
 
-        <!ENTITY commonSetup SYSTEM "./../../../../../config/properties.xml">
-        <!ENTITY commonBuild SYSTEM "./../../../../../config/common.xml">
-        <!ENTITY run SYSTEM "./../../../../../config/run.xml">
-        <!ENTITY testProperties SYSTEM "./build.properties">
-        ]>
+<!ENTITY commonSetup SYSTEM "./../../../../../config/properties.xml">
+<!ENTITY commonBuild SYSTEM "./../../../../../config/common.xml">
+<!ENTITY run SYSTEM "./../../../../../config/run.xml">
+<!ENTITY testProperties SYSTEM "./build.properties">
+]>
 
 
 <project name="cci" basedir="." default="usage">
@@ -32,291 +32,253 @@
     &testProperties;
     &run;
 
-    <target name="all" depends="build,setup,deploy,run,undeploy,unsetup"/>
-    <target name="run-dp-test" depends="build,setup,deploy-dp,run,undeploy-dp,unsetup"/>
-    <target name="run-test" depends="build,deploy,run,undeploy"/>
+  <target name="all" depends="build,setup,deploy,run,undeploy,unsetup" />
+  <target name="run-dp-test" depends="build,setup,deploy-dp,run,undeploy-dp,unsetup" />
+  <target name="run-test" depends="build,deploy,run,undeploy" />
 
-    <target name="clean" depends="init-common">
-        <delete dir="${build.classes.dir}"/>
-        <delete dir="${assemble.dir}"/>
-        <delete dir="${assemble.dir}/rar"/>
-        <delete file="${assemble.dir}/${rarname}.rar"/>
-        <antcall target="create-dboutfile"/>
-    </target>
+  <target name="clean" depends="init-common">
+    <delete dir="${build.classes.dir}" />
+    <delete dir="${assemble.dir}" />
+    <delete dir="${assemble.dir}/rar" />
+    <delete file="${assemble.dir}/${rarname}.rar" />
+    <antcall target="create-dboutfile" />
+  </target>
 
-    <target name="compile" depends="clean">
-        <antcall target="compile-cci">
-            <param name="src" value="ejb"/>
-        </antcall>
-        <antcall target="compile-cci">
-            <param name="src" value="client"/>
-        </antcall>
+  <target name="compile" depends="clean">
+    <antcall target="compile-cci">
+      <param name="src" value="ejb" />
+    </antcall>
+    <antcall target="compile-cci">
+      <param name="src" value="client" />
+    </antcall>
 
-        <antcall target="compile-common">
-            <param name="src" value="servlet"/>
-        </antcall>
+    <antcall target="compile-common">
+      <param name="src" value="servlet" />
+    </antcall>
 
 
-        <javac
-                srcdir="."
-                classpath="${env.APS_HOME}/lib/reporter.jar"
-                includes="client/WebTest.java" destdir="."/>
+    <javac srcdir="."
+           classpath="${env.APS_HOME}/lib/reporter.jar"
+           includes="client/WebTest.java"
+           destdir="."
+    />
 
-    </target>
+  </target>
 
 
-    <!--
+  <!--
     Custom target for compilation with local libraries for connector
     -->
-    <target name="compile-cci" depends="init-common">
-        <mkdir dir="${build.classes.dir}"/>
-        <javac srcdir="${src}"
-               destdir="${build.classes.dir}"
-               classpath="${s1astest.classpath}:${cciblackbox.path}"
-               failonerror="true"/>
-    </target>
+  <target name="compile-cci" depends="init-common">
+    <mkdir dir="${build.classes.dir}" />
+    <javac srcdir="${src}"
+           destdir="${build.classes.dir}"
+           classpath="${s1astest.classpath}:${bundles.dir}/cciblackbox-tx.jar"
+           failonerror="true"
+    />
+  </target>
 
-    <target name="create-pb-proc" depends="init-common">
+  <target name="create-pb-proc" depends="init-common">
 
-        <jar destfile="${build.classes.dir}/cci-pb-proc.jar" update="true"
-             includes="${build.classes.dir}/client/*SampleExternalMethods.class*"/>
+    <jar destfile="${build.classes.dir}/cci-pb-proc.jar"
+         update="true"
+         includes="${build.classes.dir}/client/*SampleExternalMethods.class*"
+    />
+  </target>
+
+  <target name="build" depends="compile">
+
+    <antcall target="webclient-war-common">
+      <param name="hasWebclient" value="yes" />
+      <param name="appname" value="connector-cci" />
+      <param name="web.xml" value="descriptor/web.xml" />
+      <param name="sun-web.xml" value="descriptor/sun-web.xml" />
+      <param name="webclient.war.classes" value="servlet/*.class, beans/*.class" />
+    </antcall>
+
+    <antcall target="build-ear-common">
+      <param name="ejbjar.classes" value="**/*Local*.class, **/*Remote*.class, **/*Bean*.class" />
+      <param name="appclientjar.classes"
+             value="**/*Local*.class,**/*Remote*.class,**/*Home*.class,**/*Client*.class"
+      />
+    </antcall>
+  </target>
+
+  <target name="deploy" depends="init-common">
+    <antcall target="package-rar" />
+    <antcall target="deploy-rar">
+      <param name="tx.mode" value="tx" />
+    </antcall>
+    <antcall target="deploy-common" />
+  </target>
+
+  <target name="deploy-dp" depends="init-common">
+    <antcall target="create-pool">
+      <param name="tx.mode" value="tx" />
+    </antcall>
+    <antcall target="create-resource">
+      <param name="tx.mode" value="tx" />
+    </antcall>
+    <antcall target="deploy-common" />
+  </target>
+
+  <target name="undeploy">
+    <antcall target="undeploy-rar" />
+    <antcall target="undeploy-common" />
+  </target>
+
+  <target name="undeploy-dp">
+    <antcall target="delete-resource" />
+    <antcall target="delete-pool" />
+    <antcall target="undeploy-common" />
+  </target>
+
+  <target name="run" depends="init-common">
+    <java classname="client.WebTest">
+      <arg value="${http.host}" />
+      <arg value="${http.port}" />
+      <arg value="${contextroot}" />
+      <arg value=" 1 " />
+      <classpath>
+        <pathelement location="${env.APS_HOME}/lib/reporter.jar" />
+        <pathelement location="." />
+      </classpath>
+    </java>
+
+  </target>
+
+  <!-- setup -->
+  <target name="setup" depends="init-common, build">
+    <antcall target="drop-sql" />
+    <antcall target="create-sql" />
+  </target>
+
+  <!-- unsetup -->
+  <target name="unsetup" depends="init-common">
+    <antcall target="drop-sql" />
+  </target>
+
+  <target name="create-pool">
+    <antcall target="create-connector-connpool-common">
+      <param name="ra.name" value="cciblackbox-${tx.mode}" />
+      <param name="connection.defname" value="jakarta.resource.cci.ConnectionFactory" />
+      <param name="connector.conpool.name" value="CCI-CONNPOOL" />
+    </antcall>
+  </target>
+
+  <target name="create-resource">
+    <antcall target="create-connector-resource-common">
+      <param name="connector.conpool.name" value="CCI-CONNPOOL" />
+      <param name="connector.jndi.name" value="eis/CCIEIS" />
+    </antcall>
+  </target>
+
+  <target name="delete-pool">
+    <antcall target="delete-connector-connpool-common">
+      <param name="connector.conpool.name" value="CCI-CONNPOOL" />
+    </antcall>
+  </target>
+
+  <target name="delete-resource">
+    <antcall target="delete-connector-resource-common">
+      <param name="connector.jndi.name" value="eis/CCIEIS" />
+    </antcall>
+  </target>
+
+  <target name="deploy-rar">
+    <antcall target="deploy-rar-common">
+      <param name="rarfile" value="${assemble.dir}/${rarname}.rar" />
+    </antcall>
+  </target>
+
+  <target name="undeploy-rar">
+    <antcall target="undeploy-rar-common">
+      <param name="undeployrar" value="cciblackbox-tx" />
+    </antcall>
+  </target>
 
 
-        <!--
-            <jar jarfile="${build.classes.dir}/cci-pb-proc.jar" update="true">
-               <fileset dir="${build.classes.dir}" casesensitive="yes">
-                 <include name="**/SampleExternalMethods.class*"/>
-                   <exclude  name="**/ejb/*"/>
-                   <exclude  name="**/servlet/*"/>
-                   <exclude  name="**/connector/*"/>
-               </fileset>
-            </jar>
-        -->
+  <!-- create the appclient jar file with custom classes-->
+  <target name="appclient-jar" depends="init-common">
+    <property name="appclientjar.classes"
+              value="**/*Local*.class,**/*Remote*.class,**/*Home*.class,**/*Client*.class"
+    />
+    <antcall target="package-appclientjar-common">
+      <param name="appclientjar.files" value="${build.classes.dir}" />
+      <param name="appclient.jar" value="${assemble.dir}/${appname}-client.jar" />
+    </antcall>
+  </target>
 
-    </target>
+  <!-- create/delete JVM options -->
+  <target name="create-JVM-options">
+    <exec executable="${ASADMIN}" failonerror="false">
+      <arg line="create-jvm-options" />
+      <arg line="--user ${admin.user}" />
+      <arg line="--passwordfile ${env.APS_HOME}/devtests/connector/config/password.txt" />
+      <arg line="--host ${admin.host}" />
+      <arg line="--port ${admin.port}" />
+      <arg line=":-Djdbc.drivers=${jdbc.drivers}" />
+    </exec>
+  </target>
 
-    <target name="build" depends="compile">
+  <target name="delete-JVM-options">
+    <exec executable="${ASADMIN}" failonerror="false">
+      <arg line="delete-jvm-options" />
+      <arg line="--user ${admin.user}" />
+      <arg line="--passwordfile ${env.APS_HOME}/devtests/connector/config/password.txt" />
+      <arg line="--host ${admin.host}" />
+      <arg line="--port ${admin.port}" />
+      <arg line=":-Djdbc.drivers=${jdbc.drivers}" />
+    </exec>
+  </target>
 
-        <antcall target="webclient-war-common">
-            <param name="hasWebclient" value="yes"/>
-            <param name="appname" value="connector-cci"/>
-            <param name="web.xml" value="descriptor/web.xml"/>
-            <param name="sun-web.xml" value="descriptor/sun-web.xml"/>
-            <param name="webclient.war.classes" value="servlet/*.class, beans/*.class"/>
-        </antcall>
+  <target name="create-rar">
+    <copy file="descriptor/ra.xml" tofile="${assemble.dir}/rar/META-INF/ra.xml" />
+    <copy file="descriptor/sun-ra.xml" tofile="${assemble.dir}/rar/META-INF/sun-ra.xml" />
+    <copy file="${bundles.dir}/cciblackbox-tx.jar" tofile="${assemble.dir}/rar/cciblackbox-tx.jar"
+    />
+    <copy file="${env.APS_HOME}/sqetests/connector/lib/cci-derby-proc.jar"
+          tofile="${assemble.dir}/rar/cci-derby-proc.jar"
+    />
+    <replace file="${assemble.dir}/rar/META-INF/ra.xml" token="DBURL" value="${db.url}" />
+  </target>
 
-        <antcall target="build-ear-common">
-            <param name="ejbjar.classes"
-                   value="**/*Local*.class, **/*Remote*.class, **/*Bean*.class"/>
-            <param name="appclientjar.classes"
-                   value="**/*Local*.class,**/*Remote*.class,**/*Home*.class,**/*Client*.class"/>
-        </antcall>
-    </target>
-
-    <target name="deploy" depends="init-common">
-        <antcall target="package-rar"/>
-        <antcall target="deploy-rar">
-            <param name="tx.mode" value="tx"/>
-        </antcall>
-        <!--    <antcall target="create-pool">
-                <param name="tx.mode" value="tx"/>
-            </antcall>
-            <antcall target="create-resource">
-                <param name="tx.mode" value="tx"/>
-            </antcall>
-        -->
-        <!--<antcall target="reconfig-common"/>-->
-        <antcall target="deploy-common"/>
-    </target>
-
-    <target name="deploy-dp" depends="init-common">
-        <antcall target="create-pool">
-            <param name="tx.mode" value="tx"/>
-        </antcall>
-        <antcall target="create-resource">
-            <param name="tx.mode" value="tx"/>
-        </antcall>
-        <antcall target="deploy-common"/>
-    </target>
-
-    <target name="undeploy">
-        <!--
-            <antcall target="delete-resource"/>
-            <antcall target="delete-pool"/>
-        -->
-        <antcall target="undeploy-rar"/>
-        <!--<antcall target="reconfig-common"/>-->
-        <antcall target="undeploy-common"/>
-    </target>
-
-    <target name="undeploy-dp">
-        <antcall target="delete-resource"/>
-        <antcall target="delete-pool"/>
-        <!--<antcall target="reconfig-common"/>-->
-        <antcall target="undeploy-common"/>
-    </target>
-
-    <target name="run" depends="init-common">
-        <!--
-            <antcall target="runclient-common">
-                <param name="appclient.application.args" value="standalone"/>
-            </antcall>
-        -->
-
-        <java classname="client.WebTest">
-            <arg value="${http.host}"/>
-            <arg value="${http.port}"/>
-            <arg value="${contextroot}"/>
-            <arg value=" 1 "/>
-            <classpath>
-                <pathelement location="${env.APS_HOME}/lib/reporter.jar"/>
-                <pathelement location="."/>
-            </classpath>
-        </java>
-
-    </target>
-
-    <!-- setup -->
-    <target name="setup" depends="init-common, build">
-        <antcall target="drop-sql"/>
-        <antcall target="create-sql"/>
-    </target>
-
-    <!-- unsetup -->
-    <target name="unsetup" depends="init-common">
-        <antcall target="drop-sql"/>
-    </target>
-
-    <target name="create-pool">
-        <antcall target="create-connector-connpool-common">
-            <param name="ra.name" value="cciblackbox-${tx.mode}"/>
-            <param name="connection.defname"
-                   value="jakarta.resource.cci.ConnectionFactory"/>
-            <param name="connector.conpool.name" value="CCI-CONNPOOL"/>
-        </antcall>
-    </target>
-
-    <target name="create-resource">
-        <antcall target="create-connector-resource-common">
-            <param name="connector.conpool.name" value="CCI-CONNPOOL"/>
-            <param name="connector.jndi.name" value="eis/CCIEIS"/>
-        </antcall>
-    </target>
-
-    <target name="delete-pool">
-        <antcall target="delete-connector-connpool-common">
-            <param name="connector.conpool.name" value="CCI-CONNPOOL"/>
-        </antcall>
-    </target>
-
-    <target name="delete-resource">
-        <antcall target="delete-connector-resource-common">
-            <param name="connector.jndi.name" value="eis/CCIEIS"/>
-        </antcall>
-    </target>
-
-    <target name="deploy-rar">
-        <antcall target="deploy-rar-common">
-            <param name="rarfile"
-                   value="${assemble.dir}/${rarname}.rar"/>
-        </antcall>
-    </target>
-
-    <target name="undeploy-rar">
-        <antcall target="undeploy-rar-common">
-            <param name="undeployrar"
-                   value="cciblackbox-tx"/>
-        </antcall>
-    </target>
+  <target name="package-rar" depends="init-common">
+    <mkdir dir="${assemble.dir}/rar" />
+    <mkdir dir="${assemble.dir}/rar/META-INF" />
+    <antcall target="create-rar" />
+    <jar destfile="${assemble.dir}/${rarname}.rar" update="true">
+      <fileset dir="${assemble.dir}/rar">
+      </fileset>
+      <metainf dir="${assemble.dir}/rar/META-INF">
+      </metainf>
+    </jar>
+  </target>
 
 
-    <!-- create the appclient jar file with custom classes-->
-    <target name="appclient-jar" depends="init-common">
-        <property name="appclientjar.classes"
-                  value="**/*Local*.class,**/*Remote*.class,**/*Home*.class,**/*Client*.class"/>
-        <antcall target="package-appclientjar-common">
-            <param name="appclientjar.files"
-                   value="${build.classes.dir}"/>
-            <param name="appclient.jar"
-                   value="${assemble.dir}/${appname}-client.jar"/>
-        </antcall>
-    </target>
+  <!-- Set classpath-suffix for pointbase -->
+  <target name="create-dboutfile" depends="init-common">
+    <mkdir dir="${build.classes.dir}" />
+    <exec executable="touch">
+      <arg line="${build.classes.dir}/setupDBTables.out" />
+    </exec>
+  </target>
 
-    <!-- create/delete JVM options -->
-    <target name="create-JVM-options">
-        <exec executable="${ASADMIN}" failonerror="false">
-            <arg line="create-jvm-options"/>
-            <arg line="--user ${admin.user}"/>
-            <arg line="--passwordfile ${env.APS_HOME}/devtests/connector/config/password.txt"/>
-            <arg line="--host ${admin.host}"/>
-            <arg line="--port ${admin.port}"/>
-            <arg line=":-Djdbc.drivers=${jdbc.drivers}"/>
-        </exec>
-        <!--<antcall target="reconfig-common" />-->
-    </target>
+  <!-- db setup -->
+  <target name="create-sql" depends="init-common">
+    <antcall target="execute-sql-common">
+      <param name="sql.file" value="sql/cci-pb.sql" />
+    </antcall>
+  </target>
 
-    <target name="delete-JVM-options">
-        <exec executable="${ASADMIN}" failonerror="false">
-            <arg line="delete-jvm-options"/>
-            <arg line="--user ${admin.user}"/>
-            <arg line="--passwordfile ${env.APS_HOME}/devtests/connector/config/password.txt"/>
-            <arg line="--host ${admin.host}"/>
-            <arg line="--port ${admin.port}"/>
-            <arg line=":-Djdbc.drivers=${jdbc.drivers}"/>
-        </exec>
-        <!--<antcall target="reconfig-common" />-->
-    </target>
+  <target name="drop-sql" depends="init-common">
+    <antcall target="execute-sql-common">
+      <param name="sql.file" value="sql/cci-pb-drop.sql" />
+    </antcall>
+  </target>
 
-    <target name="create-rar">
-        <copy file="descriptor/ra.xml"
-              tofile="${assemble.dir}/rar/META-INF/ra.xml"/>
-        <copy file="descriptor/sun-ra.xml"
-              tofile="${assemble.dir}/rar/META-INF/sun-ra.xml"/>
-        <copy file="${env.APS_HOME}/cciblackbox-tx/target/cciblackbox-tx.jar"
-              tofile="${assemble.dir}/rar/cciblackbox-tx.jar"/>
-        <copy file="${env.APS_HOME}/sqetests/connector/lib/cci-derby-proc.jar"
-              tofile="${assemble.dir}/rar/cci-derby-proc.jar"/>
-        <replace file="${assemble.dir}/rar/META-INF/ra.xml"
-                 token="DBURL" value="${db.url}"/>
-    </target>
-
-    <target name="package-rar" depends="init-common">
-        <mkdir dir="${assemble.dir}/rar"/>
-        <mkdir dir="${assemble.dir}/rar/META-INF"/>
-        <antcall target="create-rar"/>
-        <jar destfile="${assemble.dir}/${rarname}.rar" update="true">
-            <fileset dir="${assemble.dir}/rar">
-            </fileset>
-            <metainf dir="${assemble.dir}/rar/META-INF">
-            </metainf>
-        </jar>
-    </target>
-
-
-    <!-- Set classpath-suffix for pointbase -->
-
-    <target name="create-dboutfile" depends="init-common">
-        <mkdir dir="${build.classes.dir}"/>
-        <exec executable="touch">
-            <arg line="${build.classes.dir}/setupDBTables.out"/>
-        </exec>
-    </target>
-
-    <!-- db setup -->
-    <target name="create-sql" depends="init-common">
-        <antcall target="execute-sql-common">
-            <param name="sql.file" value="sql/cci-pb.sql"/>
-        </antcall>
-    </target>
-
-    <target name="drop-sql" depends="init-common">
-        <antcall target="execute-sql-common">
-            <param name="sql.file" value="sql/cci-pb-drop.sql"/>
-        </antcall>
-    </target>
-
-    <target name="usage">
-        <antcall target="usage-common"/>
-    </target>
+  <target name="usage">
+    <antcall target="usage-common" />
+  </target>
 
 </project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/build.xml
index c23bac3..f702d91 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/build.xml
@@ -149,7 +149,7 @@
     <echo message="common.xml: Compiling test source files" level="verbose"/>
     <javac srcdir="servlet"
          destdir="${build.classes.dir}"
-         classpath="${s1astest.classpath}:${env.APS_HOME}/connectors-ra-redeploy/jars/target/classes"
+         classpath="${s1astest.classpath}:${bundles.dir}/connectors-ra-redeploy-jars.jar"
          debug="on"
          failonerror="true"/>
   </target>
@@ -175,8 +175,8 @@
         <include name="*.jar" />
         <include name="*.war" />
       </fileset>
-      <fileset dir="${env.APS_HOME}/connectors-ra-redeploy/rars/target">
-        <include name="connectors-ra-redeploy-rars.rar" />
+      <fileset dir="${bundles.dir}">
+        <include name="connectors-ra-redeploy-rars.rar"/>
       </fileset>
     </ear>
   </target>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/app/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/app/build.xml
index 24661f3..2579192 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/app/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/app/build.xml
@@ -97,7 +97,7 @@
 
   <target name="deploy-rar" depends="init-common">
     <antcall target="deploy-rar-common">
-      <param name="rarfile" value="${env.APS_HOME}/connectors-ra-redeploy/rars/target/connectors-ra-redeploy-rars.rar" />
+      <param name="rarfile" value="${bundles.dir}/connectors-ra-redeploy-rars.rar" />
     </antcall>
   </target>
 
@@ -129,7 +129,7 @@
 
   <target name="undeploy-rar" depends="init-common">
     <antcall target="undeploy-rar-common">
-      <param name="undeployrar" value="connectors-ra-redeploy-rars.rar" />
+      <param name="undeployrar" value="connectors-ra-redeploy-rars" />
     </antcall>
   </target>
 
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/build.xml
index 6e20482..ee0763a 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/build.xml
@@ -49,7 +49,7 @@
       <fileset dir="../ra">
         <include name="generic-ra.rar" />
       </fileset>
-      <fileset dir="${env.APS_HOME}/connectors-ra-redeploy/rars-xa/target">
+      <fileset dir="${bundles.dir}">
         <include name="connectors-ra-redeploy-rars-xa.rar" />
       </fileset>
       <fileset dir="${env.APS_HOME}/lib">
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/build.xml
index c498f04..7b96962 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/build.xml
@@ -98,7 +98,6 @@
       <param name="admin.command" value="delete-admin-object" />
       <param name="operand.props" value="--target ${appserver.instance.name} eis/jdbcAdmin" />
     </antcall>
-    <!--<antcall target="reconfig-common"/>-->
   </target>
 
   <target name="restart">
@@ -119,17 +118,12 @@
       <param name="admin.command" value="delete-resource-adapter-config" />
       <param name="operand.props" value="${appname}App#connectors-ra-redeploy-rars" />
     </antcall>
-    <!--<antcall target="reconfig-common"/>-->
   </target>
 
   <target name="unsetup">
     <antcall target="execute-sql-connector">
       <param name="sql.file" value="sql/dropBankTables.sql" />
     </antcall>
-
-    <!--    <antcall target="delete-resource"/>
-    <antcall target="delete-pool"/>
-    <antcall target="delete-admin-object"/>-->
   </target>
 
   <target name="delete-pool">
@@ -156,7 +150,7 @@
     <echo message="common.xml: Compiling test source files" level="verbose" />
     <javac srcdir="servlet"
            destdir="${build.classes.dir}"
-           classpath="${s1astest.classpath}:${env.APS_HOME}/connectors-ra-redeploy/jars/target/classes"
+           classpath="${s1astest.classpath}:${bundles.dir}/connectors-ra-redeploy-jars.jar"
            debug="on"
            failonerror="true"
     />
@@ -183,7 +177,7 @@
         <include name="*.jar" />
         <include name="*.war" />
       </fileset>
-      <fileset dir="${env.APS_HOME}/connectors-ra-redeploy/rars/target">
+      <fileset dir="${bundles.dir}">
         <include name="connectors-ra-redeploy-rars.rar" />
       </fileset>
     </ear>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/app/META-INF/application.xml b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/app/META-INF/application.xml
index 024e650..654af64 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/app/META-INF/application.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/app/META-INF/application.xml
@@ -3,6 +3,7 @@
 <!--
 
     Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2022 Contributors to the Eclipse Foundation
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -17,28 +18,16 @@
     SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
 
 -->
-
 <application>
-
-<display-name>Redeploy rar test</display-name>
-
-  <description>Application description</description>
-
-  <module>
-    <ejb>force-deploy-rar-ejb.jar</ejb>
-  </module>
-
-<!--
-  <module>
-    <java>force-deploy-rar-client.jar</java>
-  </module>
--->
-
+    <display-name>Redeploy rar test</display-name>
+    <description>Application description</description>
+    <module>
+        <ejb>force-deploy-rar-ejb.jar</ejb>
+    </module>
     <module>
         <web>
-        <web-uri>force-deploy-rar-web.war</web-uri>
-         <context-root>force-deploy-rar</context-root>
-       </web>
-     </module>
-
+            <web-uri>force-deploy-rar-web.war</web-uri>
+            <context-root>force-deploy-rar</context-root>
+        </web>
+    </module>
 </application>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/app/src/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/app/src/build.xml
index b17857a..1216646 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/app/src/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/app/src/build.xml
@@ -30,30 +30,35 @@
   &testcommon;
 
   <target name="all" depends="init-common">
-   <antcall target="compile-common">
-        <param name="src" value="." />
-        <param name="s1astest.classpath" value="${s1astest.classpath}:${env.APS_HOME}/connectors-ra-redeploy/rars/target/connectors-ra-redeploy-rars.rar:${env.APS_HOME}/connectors-ra-redeploy/jars/target/classes" />
+    <antcall target="compile-common">
+      <param name="src" value="." />
+      <param name="s1astest.classpath" value="${s1astest.classpath}:${bundles.dir}/connectors-ra-redeploy-jars.jar" />
     </antcall>
 
     <antcall target="ejb-jar-common">
-        <param name="ejb-jar.xml" value="META-INF/ejb-jar.xml" />
-        <param name="ejbjar.classes" value=" beans/*.class, ${env.APS_HOME}/connectors-ra-redeploy/jars/target/classes/**/*.class " />
-        <param name="sun-ejb-jar.xml" value="META-INF/sun-ejb-jar.xml" />
-        <param name="appname" value="generic-embedded" />
+      <param name="ejb-jar.xml" value="META-INF/ejb-jar.xml" />
+      <param name="ejbjar.classes" value=" beans/*.class " />
+      <param name="sun-ejb-jar.xml" value="META-INF/sun-ejb-jar.xml" />
+      <param name="appname" value="generic-embedded" />
     </antcall>
+    <jar jarfile="${assemble.dir}/generic-embedded-ejb.jar"
+         basedir="${build.classes.dir}"
+         update="true"
+    >
+      <zipfileset src="${bundles.dir}/connectors-ra-redeploy-jars.jar" includes="**/*.class" />
+    </jar>
 
     <antcall target="appclient-jar-common">
-        <param name="appname" value="generic-embedded" />
-        <param name="application-client.xml" value="META-INF/application-client.xml" />
-        <param name="appclientjar.classes" value="beans/*.class, client/Client.class" />
-        <param name="sun-application-client.xml" value="META-INF/sun-application-client.xml" />
+      <param name="appname" value="generic-embedded" />
+      <param name="application-client.xml" value="META-INF/application-client.xml" />
+      <param name="appclientjar.classes" value="beans/*.class, client/Client.class" />
+      <param name="sun-application-client.xml" value="META-INF/sun-application-client.xml" />
     </antcall>
-
-    </target>
+  </target>
 
   <target name="clean">
     <antcall target="clean-classes-common">
-        <param name="build.classes.dir" value="classes" />
+      <param name="build.classes.dir" value="classes" />
     </antcall>
   </target>
 </project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/build.xml
index 6d90c9d..2313d44 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/build.xml
@@ -41,7 +41,7 @@
     <antcall target="compile-common">
       <param name="src" value="ejb" />
       <param name="s1astest.classpath"
-             value="${s1astest.classpath}:${env.APS_HOME}/connectors-ra-redeploy/jars/target/classes"
+             value="${s1astest.classpath}:${bundles.dir}/connectors-ra-redeploy-jars.jar"
       />
     </antcall>
     <antcall target="compile-common">
@@ -80,18 +80,14 @@
   <target name="setupone" depends="init-common">
     <antcall target="create-ra-config" />
     <antcall target="deploy-rar-common">
-      <param name="rarfile"
-             value="${env.APS_HOME}/connectors-ra-redeploy/rars/target/connectors-ra-redeploy-rars.rar"
-      />
+      <param name="rarfile" value="${bundles.dir}/connectors-ra-redeploy-rars.rar" />
       <param name="force" value="true" />
     </antcall>
   </target>
 
   <target name="setuptwo" depends="init-common">
     <!-- Applications must have the same filename, which is used as an application name -->
-    <copy file="${env.APS_HOME}/connectors-ra-redeploy/rars/target/connectors-ra-redeploy-rars-v2.rar"
-          tofile="connectors-ra-redeploy-rars.rar"
-    />
+    <copy file="${bundles.dir}/connectors-ra-redeploy-rars-v2.rar" tofile="connectors-ra-redeploy-rars.rar" />
     <antcall target="deploy-rar-common">
       <param name="rarfile" value="connectors-ra-redeploy-rars.rar" />
       <param name="force" value="true" />
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/build.xml
index 05c8e32..a782cd7 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/build.xml
@@ -157,7 +157,7 @@
     <echo message="common.xml: Compiling test source files" level="verbose" />
     <javac srcdir="servlet"
            destdir="${build.classes.dir}"
-           classpath="${s1astest.classpath}:${env.APS_HOME}/connectors-ra-redeploy/jars/target/classes"
+           classpath="${s1astest.classpath}:${bundles.dir}/connectors-ra-redeploy-jars.jar"
            debug="on"
            failonerror="true"
     />
@@ -179,8 +179,8 @@
     <delete file="${assemble.dir}/${appname}.ear" />
     <mkdir dir="${assemble.dir}" />
     <mkdir dir="${build.classes.dir}/META-INF" />
-    <copy file="${env.APS_HOME}/connectors-ra-redeploy/rars/target/connectors-ra-redeploy-rars-nojar.rar"
-          tofile="${assemble.dir}/connectors-ra-redeploy-rars.rar"
+    <copy file="${bundles.dir}/connectors-ra-redeploy-rars-nojar.rar"
+      tofile="${assemble.dir}/connectors-ra-redeploy-rars.rar"
     />
     <ear earfile="${assemble.dir}/${appname}App.ear" appxml="${application.xml}">
       <fileset dir="${assemble.dir}">
@@ -195,7 +195,7 @@
 
   <target name="install-library">
     <echo message="copying file [jdbc.jar] to applibs" />
-    <copy todir="${env.S1AS_HOME}/domains/domain1/lib/applibs" file="${env.APS_HOME}/connectors-ra-redeploy/jars/target/connectors-ra-redeploy-jars.jar" />
+    <copy file="${bundles.dir}/connectors-ra-redeploy-jars.jar" todir="${env.S1AS_HOME}/domains/domain1/lib/applibs" />
     <antcall target="restart-server" />
   </target>
 
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/app/src/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/app/src/build.xml
index b17857a..e8e756d 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/app/src/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/app/src/build.xml
@@ -23,37 +23,43 @@
 
 <project name="connector1.5 redeploy" default="all" basedir=".">
 
-  <property name="j2ee.home" value="../../../../.."/>
+  <property name="j2ee.home" value="../../../../.." />
 
   <!-- include common.xml and testcommon.xml -->
   &common;
   &testcommon;
 
   <target name="all" depends="init-common">
-   <antcall target="compile-common">
-        <param name="src" value="." />
-        <param name="s1astest.classpath" value="${s1astest.classpath}:${env.APS_HOME}/connectors-ra-redeploy/rars/target/connectors-ra-redeploy-rars.rar:${env.APS_HOME}/connectors-ra-redeploy/jars/target/classes" />
+    <antcall target="compile-common">
+      <param name="src" value="." />
+      <param name="s1astest.classpath" value="${s1astest.classpath}:${bundles.dir}/connectors-ra-redeploy-jars.jar" />
     </antcall>
 
     <antcall target="ejb-jar-common">
-        <param name="ejb-jar.xml" value="META-INF/ejb-jar.xml" />
-        <param name="ejbjar.classes" value=" beans/*.class, ${env.APS_HOME}/connectors-ra-redeploy/jars/target/classes/**/*.class " />
-        <param name="sun-ejb-jar.xml" value="META-INF/sun-ejb-jar.xml" />
-        <param name="appname" value="generic-embedded" />
+      <param name="ejb-jar.xml" value="META-INF/ejb-jar.xml" />
+      <param name="ejbjar.classes" value=" beans/*.class " />
+      <param name="sun-ejb-jar.xml" value="META-INF/sun-ejb-jar.xml" />
+      <param name="appname" value="generic-embedded" />
     </antcall>
+    <jar jarfile="${assemble.dir}/generic-embedded-ejb.jar"
+         basedir="${build.classes.dir}"
+         update="true"
+    >
+      <zipfileset src="${bundles.dir}/connectors-ra-redeploy-jars.jar" includes="**/*.class" />
+    </jar>
 
     <antcall target="appclient-jar-common">
-        <param name="appname" value="generic-embedded" />
-        <param name="application-client.xml" value="META-INF/application-client.xml" />
-        <param name="appclientjar.classes" value="beans/*.class, client/Client.class" />
-        <param name="sun-application-client.xml" value="META-INF/sun-application-client.xml" />
+      <param name="appname" value="generic-embedded" />
+      <param name="application-client.xml" value="META-INF/application-client.xml" />
+      <param name="appclientjar.classes" value="beans/*.class, client/Client.class" />
+      <param name="sun-application-client.xml" value="META-INF/sun-application-client.xml" />
     </antcall>
 
-    </target>
+  </target>
 
   <target name="clean">
     <antcall target="clean-classes-common">
-        <param name="build.classes.dir" value="classes" />
+      <param name="build.classes.dir" value="classes" />
     </antcall>
   </target>
 </project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/build.xml
index 0aa603b..8f403e9 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/build.xml
@@ -18,11 +18,11 @@
 
 -->
 
-        <!ENTITY commonSetup SYSTEM "./../../../../config/properties.xml">
-        <!ENTITY commonBuild SYSTEM "./../../../../config/common.xml">
-        <!ENTITY commonRun SYSTEM "./../../../../config/run.xml">
-        <!ENTITY testproperties SYSTEM "./build.properties">
-        ]>
+<!ENTITY commonSetup SYSTEM "./../../../../config/properties.xml">
+<!ENTITY commonBuild SYSTEM "./../../../../config/common.xml">
+<!ENTITY commonRun SYSTEM "./../../../../config/run.xml">
+<!ENTITY testproperties SYSTEM "./build.properties">
+]>
 
 <project name="redeploy-rar" default="all" basedir=".">
 
@@ -33,195 +33,191 @@
 
     <target name="all" depends="build,run"/>
 
-    <target name="clean" depends="init-common">
-        <antcall target="clean-common"/>
-    </target>
+  <target name="clean" depends="init-common">
+    <antcall target="clean-common"/>
+  </target>
 
-    <target name="compile" depends="clean">
-        <antcall target="compile-common">
-            <param name="src" value="ra"/>
-        </antcall>
+  <target name="compile" depends="clean">
+    <antcall target="compile-common">
+      <param name="src" value="ra"/>
+    </antcall>
 
-        <antcall target="compile-common">
-            <param name="src" value="ejb"/>
-            <param name="s1astest.classpath" value="${s1astest.classpath}:${env.APS_HOME}/connectors-ra-redeploy/jars/target/classes"/>
-        </antcall>
-        <antcall target="compile-common">
-            <param name="src" value="client"/>
-        </antcall>
-        <antcall target="compile-common">
-            <param name="src" value="servlet"/>
-        </antcall>
+    <antcall target="compile-common">
+      <param name="src" value="ejb"/>
+      <param name="s1astest.classpath" value="${s1astest.classpath}:${bundles.dir}/connectors-ra-redeploy-jars.jar"/>
+    </antcall>
+    <antcall target="compile-common">
+      <param name="src" value="client"/>
+    </antcall>
+    <antcall target="compile-common">
+      <param name="src" value="servlet"/>
+    </antcall>
 
-        <javac
-                srcdir="."
-                classpath="${env.APS_HOME}/lib/reporter.jar"
-                includes="client/WebTest.java" destdir="."/>
+    <javac srcdir="."
+           classpath="${env.APS_HOME}/lib/reporter.jar"
+           includes="client/WebTest.java"
+           destdir="."
+    />
+
+  </target>
+
+  <target name="build" depends="compile">
+
+    <antcall target="webclient-war-common">
+      <param name="hasWebclient" value="yes"/>
+      <param name="appname" value="redeploy-rar"/>
+      <param name="web.xml" value="descriptor/web.xml"/>
+      <param name="sun-web.xml" value="descriptor/sun-web.xml"/>
+      <param name="webclient.war.classes" value="servlet/*.class, beans/*.class"/>
+    </antcall>
+
+    <antcall target="build-ear-common">
+      <param name="ejbjar.classes" value="**/*Vers*.class"/>
+    </antcall>
+
+  </target>
+  <target name="setup" depends="init-common"/>
 
 
-    </target>
+  <target name="setupone" depends="init-common">
+    <antcall target="create-ra-config" />
+    <antcall target="deploy-rar-common">
+      <param name="rarfile" value="${bundles.dir}/connectors-ra-redeploy-rars.rar"/>
+    </antcall>
+    <antcall target="create-admin-object"/>
+    <antcall target="deploy"/>
+  </target>
 
-    <target name="build" depends="compile">
-
-        <antcall target="webclient-war-common">
-            <param name="hasWebclient" value="yes"/>
-            <param name="appname" value="redeploy-rar"/>
-            <param name="web.xml" value="descriptor/web.xml"/>
-            <param name="sun-web.xml" value="descriptor/sun-web.xml"/>
-            <param name="webclient.war.classes" value="servlet/*.class, beans/*.class"/>
-        </antcall>
-
-        <antcall target="build-ear-common">
-            <param name="ejbjar.classes"
-                   value="**/*Vers*.class"/>
-            <!--<param name="appclientjar.classes"
-                   value="**/*Client*.class"/>-->
-        </antcall>
-
-    </target>
-    <target name="setup" depends="init-common"/>
+  <target name="setuptwo" depends="init-common">
+    <antcall target="create-ra-config"/>
+    <!-- Applications must have the same filename, which is used as an application name -->
+    <copy file="${bundles.dir}/connectors-ra-redeploy-rars-v2.rar" tofile="connectors-ra-redeploy-rars.rar" />
+    <antcall target="deploy-rar-common">
+      <param name="rarfile" value="connectors-ra-redeploy-rars.rar" />
+    </antcall>
+    <antcall target="create-admin-object"/>
+    <antcall target="deploy"/>
+  </target>
 
 
-    <target name="setupone" depends="init-common">
-        <antcall target="create-ra-config"/>
-        <antcall target="deploy-rar-common">
-            <param name="rarfile" value="${env.APS_HOME}/connectors-ra-redeploy/rars/target/connectors-ra-redeploy-rars.rar"/>
-        </antcall>
-        <antcall target="create-admin-object"/>
-        <antcall target="deploy"/>
-    </target>
+  <target name="deploy" depends="init-common">
+    <antcall target="deploy-common"/>
+  </target>
 
-    <target name="setuptwo" depends="init-common">
-        <antcall target="create-ra-config"/>
-        <!-- Applications must have the same filename, which is used as an application name -->
-        <copy file="${env.APS_HOME}/connectors-ra-redeploy/rars/target/connectors-ra-redeploy-rars-v2.rar" tofile="connectors-ra-redeploy-rars.rar"/>
-        <antcall target="deploy-rar-common">
-          <param name="rarfile" value="connectors-ra-redeploy-rars.rar"/>
-        </antcall>
-        <antcall target="create-admin-object"/>
-        <antcall target="deploy"/>
-    </target>
+  <target name="run" depends="init-common">
+    <!-- Running the redeploy cycle to test version 1 classes getting reset after verison 2 is undeployed -->
+    <antcall target="runCycle"/>
+    <antcall target="runCycle"/>
+  </target>
+
+  <target name="runCycle" depends="init-common">
+    <antcall target="setupone"/>
+    <java classname="client.WebTest">
+      <arg value="${http.host}"/>
+      <arg value="${http.port}"/>
+      <arg value="${contextroot}"/>
+      <arg value=" 1 "/>
+      <classpath>
+        <pathelement location="${env.APS_HOME}/lib/reporter.jar"/>
+        <pathelement location="."/>
+      </classpath>
+    </java>
+
+    <antcall target="unsetup"/>
 
 
-    <target name="deploy" depends="init-common">
-        <antcall target="deploy-common"/>
-    </target>
-
-    <target name="run" depends="init-common">
-        <!-- Running the redeploy cycle to test version 1 classes getting reset after verison 2 is undeployed -->
-        <antcall target="runCycle"/>
-        <antcall target="runCycle"/>
-    </target>
-
-    <target name="runCycle" depends="init-common">
-        <antcall target="setupone"/>
-        <java classname="client.WebTest">
-            <arg value="${http.host}"/>
-            <arg value="${http.port}"/>
-            <arg value="${contextroot}"/>
-            <arg value=" 1 "/>
-            <classpath>
-                <pathelement location="${env.APS_HOME}/lib/reporter.jar"/>
-                <pathelement location="."/>
-            </classpath>
-        </java>
-
-        <antcall target="unsetup"/>
+    <antcall target="setuptwo"/>
+    <java classname="client.WebTest">
+      <arg value="${http.host}"/>
+      <arg value="${http.port}"/>
+      <arg value="${contextroot}"/>
+      <arg value=" 2 "/>
+      <classpath>
+        <pathelement location="${env.APS_HOME}/lib/reporter.jar"/>
+        <pathelement location="."/>
+      </classpath>
+    </java>
+    <antcall target="unsetup"/>
+  </target>
 
 
-        <antcall target="setuptwo"/>
-        <java classname="client.WebTest">
-            <arg value="${http.host}"/>
-            <arg value="${http.port}"/>
-            <arg value="${contextroot}"/>
-            <arg value=" 2 "/>
-            <classpath>
-                <pathelement location="${env.APS_HOME}/lib/reporter.jar"/>
-                <pathelement location="."/>
-            </classpath>
-        </java>
-        <antcall target="unsetup"/>
-    </target>
+  <target name="unsetup" depends="init-common">
+    <antcall target="delete-admin-object"/>
+    <antcall target="delete-ra-config"/>
+    <antcall target="undeploy"/>
+  </target>
+
+  <target name="undeploy" depends="init-common">
+    <antcall target="undeploy-common"/>
+    <antcall target="undeploy-rar-common">
+      <param name="undeployrar" value="connectors-ra-redeploy-rars"/>
+    </antcall>
+  </target>
 
 
-    <target name="unsetup" depends="init-common">
-        <antcall target="delete-admin-object"/>
-        <antcall target="delete-ra-config"/>
-        <antcall target="undeploy"/>
-    </target>
+  <target name="usage">
+    <antcall target="usage-common"/>
+  </target>
 
-    <target name="undeploy" depends="init-common">
-        <antcall target="undeploy-common"/>
-        <antcall target="undeploy-rar-common">
-            <param name="undeployrar" value="connectors-ra-redeploy-rars"/>
-        </antcall>
-    </target>
+  <target name="create-pool">
+    <antcall target="create-connector-connpool-common">
+      <param name="ra.name" value="connectors-ra-redeploy-rars"/>
+      <param name="connection.defname" value="javax.sql.DataSource"/>
+      <param name="connector.conpool.name" value="versiontest-ra-pool"/>
+    </antcall>
+    <antcall target="set-oracle-props">
+      <param name="pool.type" value="connector"/>
+      <param name="conpool.name" value="versiontest-ra-pool"/>
+    </antcall>
+  </target>
 
+  <target name="create-resource">
+    <antcall target="create-connector-resource-common">
+      <param name="connector.conpool.name" value="versiontest-ra-pool"/>
+      <param name="connector.jndi.name" value="jdbc/ejb-subclassing"/>
+    </antcall>
+  </target>
 
-    <target name="usage">
-        <antcall target="usage-common"/>
-    </target>
-
-    <target name="create-pool">
-        <antcall target="create-connector-connpool-common">
-            <param name="ra.name" value="connectors-ra-redeploy-rars"/>
-            <param name="connection.defname" value="javax.sql.DataSource"/>
-            <param name="connector.conpool.name" value="versiontest-ra-pool"/>
-        </antcall>
-        <antcall target="set-oracle-props">
-            <param name="pool.type" value="connector"/>
-            <param name="conpool.name" value="versiontest-ra-pool"/>
-        </antcall>
-    </target>
-
-    <target name="create-resource">
-        <antcall target="create-connector-resource-common">
-            <param name="connector.conpool.name" value="versiontest-ra-pool"/>
-            <param name="connector.jndi.name" value="jdbc/ejb-subclassing"/>
-        </antcall>
-    </target>
-
-    <target name="create-admin-object" depends="init-common">
-        <antcall target="asadmin-common">
-            <param name="admin.command"
+  <target name="create-admin-object" depends="init-common">
+    <antcall target="asadmin-common">
+      <param name="admin.command"
                    value="create-admin-object --target ${appserver.instance.name} --restype com.sun.jdbcra.spi.JdbcSetupAdmin --raname connectors-ra-redeploy-rars --property TableName=customer2:JndiName=jdbc/ejb-subclassing:SchemaName=connector:NoOfRows=1"/>
-            <param name="operand.props" value="eis/testAdmin"/>
-        </antcall>
-    </target>
+      <param name="operand.props" value="eis/testAdmin"/>
+    </antcall>
+  </target>
 
-    <target name="delete-pool">
-        <antcall target="delete-connector-connpool-common">
-            <param name="connector.conpool.name" value="versiontest-ra-pool"/>
-        </antcall>
-    </target>
+  <target name="delete-pool">
+    <antcall target="delete-connector-connpool-common">
+      <param name="connector.conpool.name" value="versiontest-ra-pool"/>
+    </antcall>
+  </target>
 
-    <target name="delete-resource">
-        <antcall target="delete-connector-resource-common">
-            <param name="connector.jndi.name" value="jdbc/ejb-subclassing"/>
-        </antcall>
-    </target>
+  <target name="delete-resource">
+    <antcall target="delete-connector-resource-common">
+      <param name="connector.jndi.name" value="jdbc/ejb-subclassing"/>
+    </antcall>
+  </target>
 
 
-    <target name="delete-admin-object" depends="init-common">
-        <antcall target="asadmin-common">
-            <param name="admin.command" value="delete-admin-object"/>
-            <param name="operand.props" value="--target ${appserver.instance.name} eis/testAdmin"/>
-        </antcall>
-    </target>
+  <target name="delete-admin-object" depends="init-common">
+    <antcall target="asadmin-common">
+      <param name="admin.command" value="delete-admin-object"/>
+      <param name="operand.props" value="--target ${appserver.instance.name} eis/testAdmin"/>
+    </antcall>
+  </target>
 
 
-    <target name="create-ra-config" depends="init-common">
-        <antcall target="asadmin-common">
-            <param name="admin.command" value="create-resource-adapter-config  --property RAProperty=VALID"/>
-            <param name="operand.props" value="connectors-ra-redeploy-rars"/>
-        </antcall>
-    </target>
-    <target name="delete-ra-config" depends="init-common">
-        <antcall target="asadmin-common">
-            <param name="admin.command" value="delete-resource-adapter-config"/>
-            <param name="operand.props" value="connectors-ra-redeploy-rars"/>
-        </antcall>
-        <!--<antcall target="reconfig-common"/>-->
-    </target>
+  <target name="create-ra-config" depends="init-common">
+    <antcall target="asadmin-common">
+      <param name="admin.command" value="create-resource-adapter-config  --property RAProperty=VALID"/>
+      <param name="operand.props" value="connectors-ra-redeploy-rars"/>
+    </antcall>
+  </target>
+  <target name="delete-ra-config" depends="init-common">
+    <antcall target="asadmin-common">
+      <param name="admin.command" value="delete-resource-adapter-config"/>
+      <param name="operand.props" value="connectors-ra-redeploy-rars"/>
+    </antcall>
+  </target>
 
 </project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/securitymapweb/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/securitymapweb/build.xml
index 045138c..156f70b 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/securitymapweb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/securitymapweb/build.xml
@@ -87,7 +87,7 @@
     <exec executable="${ASADMIN}" failonerror="false">
       <arg line="deploy" />
       <arg line="${as.props}" />
-      <arg line="${env.APS_HOME}/connectors-ra-redeploy/rars/target/connectors-ra-redeploy-rars.rar" />
+      <arg line="${bundles.dir}/connectors-ra-redeploy-rars.rar" />
     </exec>
 
     <antcall target="create-connector-connpool-common">
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/build.xml b/appserver/tests/appserv-tests/devtests/connector/web2connector/build.xml
index 5657ee7..ce62e11 100644
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/web2connector/build.xml
@@ -48,7 +48,7 @@
 
     <antcall target="deploy-rar-common">
       <param name="rarfile"
-             value="${env.APS_HOME}/connectors-ra-redeploy/rars/target/connectors-ra-redeploy-rars.rar"
+             value="${bundles.dir}/connectors-ra-redeploy-rars.rar"
       />
     </antcall>
     <antcall target="create-pool" />
@@ -153,7 +153,7 @@
     <echo message="common.xml: Compiling test source files" level="verbose" />
     <javac srcdir="servlet"
            destdir="${build.classes.dir}"
-           classpath="${s1astest.classpath}:${env.APS_HOME}/connectors-ra-redeploy/jars/target/classes"
+           classpath="${s1astest.classpath}:${bundles.dir}/connectors-ra-redeploy-jars.jar"
            debug="on"
            failonerror="true"
     />
diff --git a/appserver/tests/appserv-tests/devtests/ejb/build.xml b/appserver/tests/appserv-tests/devtests/ejb/build.xml
index f172749..88d4e36 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/build.xml
@@ -89,7 +89,6 @@
     </target>
 
     <target name="clean-result">
-
         <delete>
            <fileset dir="${env.APS_HOME}" includes="test_results*"/>
         </delete>
@@ -97,7 +96,6 @@
            <fileset dir="." includes="*.output"/>
         </delete>
         <record name="ejb.output" action="start" />
-
     </target>
 
     <target name="test-lite">
@@ -158,7 +156,6 @@
         <ant target="stopDomain"/>
         <antcall target="stop-database"/>
         <record name="ejb.output" action="stop" />
-
     </target>
 
     <target name="orb_integration">
@@ -168,9 +165,6 @@
         <ant dir="txprop" target="all"/>
         <ant dir="stubs" target="all"/>
         <ant dir="bmp" target="txtests"/>
-<!-- gradually reenable the existing tests as features come on line
-        <ant dir="bmp" target="handle"/>
--->
     </target>
 
     <target name="start-database" depends="init-common">
diff --git a/appserver/tests/appserv-tests/devtests/ejb/run_test.sh b/appserver/tests/appserv-tests/devtests/ejb/run_test.sh
index 1487e39..af86eeb 100755
--- a/appserver/tests/appserv-tests/devtests/ejb/run_test.sh
+++ b/appserver/tests/appserv-tests/devtests/ejb/run_test.sh
@@ -44,7 +44,10 @@
                         domain1
 
         # Create
-        echo "admin.domain=domain1
+        echo "
+        gf.version=\${env.GF_VERSION}
+        bundles.dir=\${env.WORKSPACE}/bundles
+        admin.domain=domain1
         admin.domain.dir=\${env.S1AS_HOME}/domains
         admin.port=${ADMIN_PORT}
         admin.user=anonymous
@@ -124,7 +127,10 @@
                         domain1
 
         # Create
-        echo "admin.domain=domain1
+        echo "
+        gf.version=\${env.GF_VERSION}
+        bundles.dir=\${env.WORKSPACE}/bundles
+        admin.domain=domain1
         admin.domain.dir=\${env.S1AS_HOME}/domains
         admin.port=${ADMIN_PORT}
         admin.user=anonymous
@@ -206,7 +212,10 @@
                         domain1
 
         # Create
-        echo "admin.domain=domain1
+        echo "
+        gf.version=\${env.GF_VERSION}
+        bundles.dir=\${env.WORKSPACE}/bundles
+        admin.domain=domain1
         admin.domain.dir=\${env.S1AS_HOME}/domains
         admin.port=${ADMIN_PORT}
         admin.user=anonymous
diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/run_test.sh b/appserver/tests/appserv-tests/devtests/transaction/ee/run_test.sh
index 2a007c8..f245d4c 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/run_test.sh
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/run_test.sh
@@ -48,7 +48,10 @@
       domain1
 
   # Create
-  echo "admin.domain=domain1
+  echo "
+  gf.version=\${env.GF_VERSION}
+  bundles.dir=\${env.WORKSPACE}/bundles
+  admin.domain=domain1
   admin.domain.dir=\${env.S1AS_HOME}/domains
   admin.port=${ADMIN_PORT}
   admin.user=anonymous
diff --git a/appserver/tests/appserv-tests/devtests/web/run_test.sh b/appserver/tests/appserv-tests/devtests/web/run_test.sh
index b2ba2ee..06757e1 100755
--- a/appserver/tests/appserv-tests/devtests/web/run_test.sh
+++ b/appserver/tests/appserv-tests/devtests/web/run_test.sh
@@ -94,7 +94,10 @@
   HOST="localhost"
 
   # Create
-  echo "admin.domain=domain1
+  echo "
+  gf.version=\${env.GF_VERSION}
+  bundles.dir=\${env.WORKSPACE}/bundles
+  admin.domain=domain1
   admin.domain.dir=\${env.S1AS_HOME}/domains
   admin.port=${WEBTIER_ADMIN_PORT}
   admin.user=admin
diff --git a/appserver/tests/gftest.sh b/appserver/tests/gftest.sh
index 0256cc9..fc89d43 100755
--- a/appserver/tests/gftest.sh
+++ b/appserver/tests/gftest.sh
@@ -52,7 +52,8 @@
   tar -xzf ${WORKSPACE}/bundles/maven-repo.tar.gz --overwrite -m -p -C ${HOME}/.m2/repository
   echo "Removing old glassfish directory: ${S1AS_HOME}";
   rm -rf "${S1AS_HOME}";
+  export GF_VERSION="$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)";
+  export MVN_REPOSITORY="${HOME}/.m2/repository";
 fi
 
 "$@"
-
diff --git a/gfbuild.sh b/gfbuild.sh
index 30762b8..25c7f3b 100755
--- a/gfbuild.sh
+++ b/gfbuild.sh
@@ -83,5 +83,5 @@
 "$@"
 
 if [ ! -z "${JENKINS_HOME}" ] ; then
-  tar -c --exclude='*.zip' --exclude='*/main/tests/*' --exclude='*/main/distributions/*' --exclude='*/main/extras/*' --exclude='*/main/admingui/*' --newer-mtime '1 day ago' -C ${HOME}/.m2/repository org/glassfish/main | gzip --fast > ${WORKSPACE}/bundles/maven-repo.tar.gz
+  tar -c --exclude='*.zip' --exclude='*/main/tests/tck/*' --exclude='*/main/distributions/*' --exclude='*/main/extras/*' --exclude='*/main/admingui/*' --newer-mtime '1 day ago' -C ${HOME}/.m2/repository org/glassfish/main | gzip --fast > ${WORKSPACE}/bundles/maven-repo.tar.gz
 fi
diff --git a/runtests.sh b/runtests.sh
index 6feb26b..2b7e700 100755
--- a/runtests.sh
+++ b/runtests.sh
@@ -64,6 +64,7 @@
   exit 2;
 fi
 
+export MVN_REPOSITORY="${HOME}/.m2/repository"
 export WORKSPACE="$(pwd)/target"
 export TEST_RUN_LOG="${WORKSPACE}/tests-run.log"
 export CLASSPATH="${WORKSPACE}/glassfish6/javadb"