connector test runs with mdb.

Signed-off-by: Gurunandan Rao <[email protected]>
jakartaee · Jan 13, 2025 · 27e97c0 · 27e97c0
1 parent 202f4a1
commit 27e97c0
Show file tree

Hide file tree

Showing 110 changed files with 952 additions and 31,141 deletions.
diff --git a/...sfish-runner/connector-platform-tck/connectors/whitebox/annotated/whitebox-anno_no_md.rar b/...sfish-runner/connector-platform-tck/connectors/whitebox/annotated/whitebox-anno_no_md.rar
diff --git a/glassfish-runner/connector-platform-tck/connectors/whitebox/ibanno/whitebox-ibanno_no_md.rar b/glassfish-runner/connector-platform-tck/connectors/whitebox/ibanno/whitebox-ibanno_no_md.rar
diff --git a/...fish-runner/connector-platform-tck/connectors/whitebox/mdcomplete/whitebox-mdcomplete.rar b/...fish-runner/connector-platform-tck/connectors/whitebox/mdcomplete/whitebox-mdcomplete.rar
diff --git a/glassfish-runner/connector-platform-tck/connectors/whitebox/mixedmode/whitebox-mixedmode.rar b/glassfish-runner/connector-platform-tck/connectors/whitebox/mixedmode/whitebox-mixedmode.rar
diff --git a/glassfish-runner/connector-platform-tck/connectors/whitebox/multianno/whitebox-multianno.rar b/glassfish-runner/connector-platform-tck/connectors/whitebox/multianno/whitebox-multianno.rar
diff --git a/...-runner/connector-platform-tck/connectors/whitebox/permissiondd/whitebox-permissiondd.rar b/...-runner/connector-platform-tck/connectors/whitebox/permissiondd/whitebox-permissiondd.rar
diff --git a/glassfish-runner/connector-platform-tck/j2ee.pass b/glassfish-runner/connector-platform-tck/j2ee.pass
@@ -0,0 +1,17 @@
+
+#
+# Copyright (c) 2023 Oracle and/or its affiliates. All rights reserved.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0, which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# This Source Code may also be made available under the following Secondary
+# Licenses when the conditions for such availability set forth in the
+# Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+# version 2 with the GNU Classpath Exception, which is available at
+# https://www.gnu.org/software/classpath/license.html.
+#
+# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+#
+AS_ADMIN_USERPASSWORD=j2ee
diff --git a/glassfish-runner/connector-platform-tck/javajoe.pass b/glassfish-runner/connector-platform-tck/javajoe.pass
@@ -0,0 +1,16 @@
+#
+# Copyright (c) 2023 Oracle and/or its affiliates. All rights reserved.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0, which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# This Source Code may also be made available under the following Secondary
+# Licenses when the conditions for such availability set forth in the
+# Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+# version 2 with the GNU Classpath Exception, which is available at
+# https://www.gnu.org/software/classpath/license.html.
+#
+# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+#
+AS_ADMIN_USERPASSWORD=javajoe
diff --git a/glassfish-runner/connector-platform-tck/pom.xml b/glassfish-runner/connector-platform-tck/pom.xml
diff --git a/glassfish-runner/connector-platform-tck/run.log b/glassfish-runner/connector-platform-tck/run.log
diff --git a/glassfish-runner/connector-platform-tck/src/test/resources/appclient-arquillian.xml b/glassfish-runner/connector-platform-tck/src/test/resources/appclient-arquillian.xml
@@ -52,7 +52,7 @@
             <property name="cmdLineArgSeparator">\\</property>
             <!-- Pass ENV vars here -->
             <property name="clientEnvString">PATH=${env.PATH};LD_LIBRARY_PATH=${glassfish.home}/lib;AS_DEBUG=true;
-                APPCPATH=${glassfish.home}/glassfish/lib/arquillian-protocol-lib.jar:target/appclient/lib/arquillian-core.jar:target/appclient/lib/arquillian-junit5.jar:${glassfish.home}/glassfish/modules/security.jar</property>
+                APPCPATH=${glassfish.home}/glassfish/lib/arquillian-protocol-lib.jar:${glassfish.home}/glassfish/lib/connector.jar:target/appclient/lib/arquillian-core.jar:target/appclient/lib/arquillian-junit5.jar:${glassfish.home}/glassfish/modules/security.jar</property>
             <property name="clientDir">${project.basedir}</property>
             <property name="workDir">${ts.home}/tmp</property>
             <property name="tsJteFile">${ts.home}/bin/ts.jte</property>

diff --git a/glassfish-runner/xa-platform-tck/pom.xml b/glassfish-runner/xa-platform-tck/pom.xml
@@ -518,6 +518,10 @@
                                 <argument>create-connector-connection-pool</argument>
                                 <argument>--raname</argument>
                                 <argument>whitebox-tx</argument>
+                                <argument>--user</argument>
+                                <argument>${admin.user}</argument>
+                                <argument>--passwordfile</argument>
+                                <argument>${password.file}</argument>
                                 <argument>--property</argument>
                                 <argument>user=cts1:password=cts1:TSRValue=comp/TransactionSynchronizationRegistry</argument>
                                 <argument>--connectiondefinition</argument>

diff --git a/...or/src/main/java/com/sun/ts/tests/connector/annotations/anno/annotationClientEjbTest.java b/...or/src/main/java/com/sun/ts/tests/connector/annotations/anno/annotationClientEjbTest.java
@@ -69,6 +69,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
             JavaArchive annotations_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "annotations_ejb_vehicle_client.jar");
             // The class files
             annotations_ejb_vehicle_client.addClasses(
+            com.sun.ts.tests.connector.annotations.anno.annotationClient.class,
             com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
             com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
             com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class,
@@ -118,7 +119,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
               annotations_ejb_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml");
             }
             // The sun-ejb-jar.xml file
-            ejbResURL1 = annotationClient.class.getResource("annotations_jsp_vehicle_web.war.sun-web.xml");
+            ejbResURL1 = annotationClient.class.getResource("annotations_ejb_vehicle_ejb.jar.sun-ejb-jar.xml");
             if(ejbResURL1 != null) {
               annotations_ejb_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml");
             }

diff --git a/...or/src/main/java/com/sun/ts/tests/connector/annotations/anno/annotationClientJspTest.java b/...or/src/main/java/com/sun/ts/tests/connector/annotations/anno/annotationClientJspTest.java
@@ -75,7 +75,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
             com.sun.ts.tests.common.vehicle.VehicleClient.class
             );
             // The web.xml descriptor
-            URL warResURL = annotationClient.class.getResource("annotations_ejb_vehicle_ejb.xml");
+            URL warResURL = annotationClient.class.getResource("annotations_jsp_vehicle_web.xml");
             if(warResURL != null) {
               annotations_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml");
             }

diff --git a/...m/sun/ts/tests/connector/annotations/anno/annotations_ejb_vehicle_ejb.jar.sun-ejb-jar.xml b/...m/sun/ts/tests/connector/annotations/anno/annotations_ejb_vehicle_ejb.jar.sun-ejb-jar.xml
@@ -28,8 +28,8 @@
         <res-ref-name>eis/whitebox-anno_no_md</res-ref-name>
         <jndi-name>eis/whitebox-anno_no_md</jndi-name>
         <default-resource-principal>
-          <name>rauser1</name>
-          <password>rapassword1</password>
+          <name>cts1</name>
+          <password>cts1</password>
         </default-resource-principal>
       </resource-ref>
       <pass-by-reference>false</pass-by-reference>

diff --git a/...a/com/sun/ts/tests/connector/annotations/anno/annotations_jsp_vehicle_web.war.sun-web.xml b/...a/com/sun/ts/tests/connector/annotations/anno/annotations_jsp_vehicle_web.war.sun-web.xml
@@ -23,8 +23,8 @@
     <res-ref-name>eis/whitebox-anno_no_md</res-ref-name>
     <jndi-name>eis/whitebox-anno_no_md</jndi-name>
     <default-resource-principal>
-      <name>rauser1</name>
-      <password>rapassword1</password>
+      <name>cts1</name>
+      <password>cts1</password>
     </default-resource-principal>
   </resource-ref>
   <class-loader delegate="true"/>

diff --git a/...m/sun/ts/tests/connector/annotations/anno/annotations_servlet_vehicle_web.war.sun-web.xml b/...m/sun/ts/tests/connector/annotations/anno/annotations_servlet_vehicle_web.war.sun-web.xml
@@ -23,8 +23,8 @@
     <res-ref-name>eis/whitebox-anno_no_md</res-ref-name>
     <jndi-name>eis/whitebox-anno_no_md</jndi-name>
     <default-resource-principal>
-      <name>rauser1</name>
-      <password>rapassword1</password>
+      <name>cts1</name>
+      <password>cts1</password>
     </default-resource-principal>
   </resource-ref>
   <class-loader delegate="true"/>

diff --git a/...nector/src/main/java/com/sun/ts/tests/connector/annotations/mdcomplete/ClientEjbTest.java b/...nector/src/main/java/com/sun/ts/tests/connector/annotations/mdcomplete/ClientEjbTest.java
@@ -69,6 +69,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
             JavaArchive mdcomplete_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "mdcomplete_ejb_vehicle_client.jar");
             // The class files
             mdcomplete_ejb_vehicle_client.addClasses(
+            com.sun.ts.tests.connector.annotations.mdcomplete.Client.class,
             com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
             com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
             com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class,
@@ -89,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
             // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension?
             resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.jar.sun-application-client.xml");
             if(resURL != null) {
-              mdcomplete_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
+              mdcomplete_ejb_vehicle_client.addAsManifestResource(resURL, "sun-application-client.xml");
             }
             mdcomplete_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF");
             // Call the archive processor

diff --git a/.../ts/tests/connector/annotations/mdcomplete/mdcomplete_ejb_vehicle_ejb.jar.sun-ejb-jar.xml b/.../ts/tests/connector/annotations/mdcomplete/mdcomplete_ejb_vehicle_ejb.jar.sun-ejb-jar.xml
@@ -28,8 +28,8 @@
         <res-ref-name>eis/whitebox-mdcomplete</res-ref-name>
         <jndi-name>eis/whitebox-mdcomplete</jndi-name>
         <default-resource-principal>
-          <name>rauser1</name>
-          <password>rapassword1</password>
+          <name>cts1</name>
+          <password>cts1</password>
         </default-resource-principal>
       </resource-ref>
       <pass-by-reference>false</pass-by-reference>

diff --git a/.../sun/ts/tests/connector/annotations/mdcomplete/mdcomplete_jsp_vehicle_web.war.sun-web.xml b/.../sun/ts/tests/connector/annotations/mdcomplete/mdcomplete_jsp_vehicle_web.war.sun-web.xml
@@ -23,8 +23,8 @@
     <res-ref-name>eis/whitebox-mdcomplete</res-ref-name>
     <jndi-name>eis/whitebox-mdcomplete</jndi-name>
     <default-resource-principal>
-      <name>rauser1</name>
-      <password>rapassword1</password>
+      <name>cts1</name>
+      <password>cts1</password>
     </default-resource-principal>
   </resource-ref>
   <class-loader delegate="true"/>

diff --git a/.../ts/tests/connector/annotations/mdcomplete/mdcomplete_servlet_vehicle_web.war.sun-web.xml b/.../ts/tests/connector/annotations/mdcomplete/mdcomplete_servlet_vehicle_web.war.sun-web.xml
@@ -23,8 +23,8 @@
     <res-ref-name>eis/whitebox-mdcomplete</res-ref-name>
     <jndi-name>eis/whitebox-mdcomplete</jndi-name>
     <default-resource-principal>
-      <name>rauser1</name>
-      <password>rapassword1</password>
+      <name>cts1</name>
+      <password>cts1</password>
     </default-resource-principal>
   </resource-ref>
   <class-loader delegate="true"/>

diff --git a/...tor/src/main/java/com/sun/ts/tests/connector/annotations/partialanno/paClientEjbTest.java b/...tor/src/main/java/com/sun/ts/tests/connector/annotations/partialanno/paClientEjbTest.java
@@ -79,7 +79,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
             com.sun.ts.lib.harness.EETest.class,
             com.sun.ts.lib.harness.ServiceEETest.class,
             com.sun.ts.lib.harness.EETest.SetupException.class,
-            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            com.sun.ts.tests.common.vehicle.VehicleClient.class,
+            com.sun.ts.tests.connector.annotations.partialanno.paClient.class
             );
             // The application-client.xml descriptor
             URL resURL = paClient.class.getResource("mdcomplete_ejb_vehicle_client.xml");

diff --git a/...s/tests/connector/annotations/partialanno/partialanno_ejb_vehicle_ejb.jar.sun-ejb-jar.xml b/...s/tests/connector/annotations/partialanno/partialanno_ejb_vehicle_ejb.jar.sun-ejb-jar.xml
@@ -28,16 +28,16 @@
         <res-ref-name>eis/whitebox-mixedmode</res-ref-name>
         <jndi-name>eis/whitebox-mixedmode</jndi-name>
         <default-resource-principal>
-          <name>rauser1</name>
-          <password>rapassword1</password>
+          <name>cts1</name>
+          <password>cts1</password>
         </default-resource-principal>
       </resource-ref>
       <resource-ref>
         <res-ref-name>eis/whitebox-multianno</res-ref-name>
         <jndi-name>eis/whitebox-multianno</jndi-name>
         <default-resource-principal>
-          <name>rauser1</name>
-          <password>rapassword1</password>
+          <name>cts1</name>
+          <password>cts1</password>
         </default-resource-principal>
       </resource-ref>
       <pass-by-reference>false</pass-by-reference>

diff --git a/...un/ts/tests/connector/annotations/partialanno/partialanno_jsp_vehicle_web.war.sun-web.xml b/...un/ts/tests/connector/annotations/partialanno/partialanno_jsp_vehicle_web.war.sun-web.xml
@@ -23,16 +23,16 @@
     <res-ref-name>eis/whitebox-mixedmode</res-ref-name>
     <jndi-name>eis/whitebox-mixedmode</jndi-name>
     <default-resource-principal>
-      <name>rauser1</name>
-      <password>rapassword1</password>
+      <name>cts1</name>
+      <password>cts1</password>
     </default-resource-principal>
   </resource-ref>
   <resource-ref>
     <res-ref-name>eis/whitebox-multianno</res-ref-name>
     <jndi-name>eis/whitebox-multianno</jndi-name>
     <default-resource-principal>
-      <name>rauser1</name>
-      <password>rapassword1</password>
+      <name>cts1</name>
+      <password>cts1</password>
     </default-resource-principal>
   </resource-ref>
   <class-loader delegate="true"/>

diff --git a/...s/tests/connector/annotations/partialanno/partialanno_servlet_vehicle_web.war.sun-web.xml b/...s/tests/connector/annotations/partialanno/partialanno_servlet_vehicle_web.war.sun-web.xml
@@ -23,16 +23,16 @@
     <res-ref-name>eis/whitebox-mixedmode</res-ref-name>
     <jndi-name>eis/whitebox-mixedmode</jndi-name>
     <default-resource-principal>
-      <name>rauser1</name>
-      <password>rapassword1</password>
+      <name>cts1</name>
+      <password>cts1</password>
     </default-resource-principal>
   </resource-ref>
   <resource-ref>
     <res-ref-name>eis/whitebox-multianno</res-ref-name>
     <jndi-name>eis/whitebox-multianno</jndi-name>
     <default-resource-principal>
-      <name>rauser1</name>
-      <password>rapassword1</password>
+      <name>cts1</name>
+      <password>cts1</password>
     </default-resource-principal>
   </resource-ref>
   <class-loader delegate="true"/>

diff --git a/...ector/src/main/java/com/sun/ts/tests/connector/connManager/connManagerClient1EjbTest.java b/...ector/src/main/java/com/sun/ts/tests/connector/connManager/connManagerClient1EjbTest.java
@@ -67,6 +67,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
             JavaArchive connManager_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "connManager_ejb_vehicle_client.jar");
             // The class files
             connManager_ejb_vehicle_client.addClasses(
+            com.sun.ts.tests.connector.connManager.connManagerClient1.class,
             com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
             com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
             com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class,

diff --git a/...va/com/sun/ts/tests/connector/connManager/connManager_ejb_vehicle_ejb.jar.sun-ejb-jar.xml b/...va/com/sun/ts/tests/connector/connManager/connManager_ejb_vehicle_ejb.jar.sun-ejb-jar.xml
@@ -28,24 +28,24 @@
         <res-ref-name>eis/whitebox-tx</res-ref-name>
         <jndi-name>eis/whitebox-tx</jndi-name>
         <default-resource-principal>
-          <name>rauser1</name>
-          <password>rapassword1</password>
+          <name>cts1</name>
+          <password>cts1</password>
         </default-resource-principal>
       </resource-ref>
       <resource-ref>
         <res-ref-name>eis/whitebox-notx</res-ref-name>
         <jndi-name>eis/whitebox-notx</jndi-name>
         <default-resource-principal>
-          <name>rauser1</name>
-          <password>rapassword1</password>
+          <name>cts1</name>
+          <password>cts1</password>
         </default-resource-principal>
       </resource-ref>
       <resource-ref>
         <res-ref-name>eis/whitebox-xa</res-ref-name>
         <jndi-name>eis/whitebox-xa</jndi-name>
         <default-resource-principal>
-          <name>rauser1</name>
-          <password>rapassword1</password>
+          <name>cts1</name>
+          <password>cts1</password>
         </default-resource-principal>
       </resource-ref>
       <resource-ref>

diff --git a/...n/java/com/sun/ts/tests/connector/connManager/connManager_jsp_vehicle_web.war.sun-web.xml b/...n/java/com/sun/ts/tests/connector/connManager/connManager_jsp_vehicle_web.war.sun-web.xml
@@ -23,24 +23,24 @@
     <res-ref-name>eis/whitebox-tx</res-ref-name>
     <jndi-name>eis/whitebox-tx</jndi-name>
     <default-resource-principal>
-      <name>rauser1</name>
-      <password>rapassword1</password>
+      <name>cts1</name>
+      <password>cts1</password>
     </default-resource-principal>
   </resource-ref>
   <resource-ref>
     <res-ref-name>eis/whitebox-notx</res-ref-name>
     <jndi-name>eis/whitebox-notx</jndi-name>
     <default-resource-principal>
-      <name>rauser1</name>
-      <password>rapassword1</password>
+      <name>cts1</name>
+      <password>cts1</password>
     </default-resource-principal>
   </resource-ref>
   <resource-ref>
     <res-ref-name>eis/whitebox-xa</res-ref-name>
     <jndi-name>eis/whitebox-xa</jndi-name>
     <default-resource-principal>
-      <name>rauser1</name>
-      <password>rapassword1</password>
+      <name>cts1</name>
+      <password>cts1</password>
     </default-resource-principal>
   </resource-ref>
   <resource-ref>

diff --git a/...va/com/sun/ts/tests/connector/connManager/connManager_servlet_vehicle_web.war.sun-web.xml b/...va/com/sun/ts/tests/connector/connManager/connManager_servlet_vehicle_web.war.sun-web.xml
@@ -23,24 +23,24 @@
     <res-ref-name>eis/whitebox-tx</res-ref-name>
     <jndi-name>eis/whitebox-tx</jndi-name>
     <default-resource-principal>
-      <name>rauser1</name>
-      <password>rapassword1</password>
+      <name>cts1</name>
+      <password>cts1</password>
     </default-resource-principal>
   </resource-ref>
   <resource-ref>
     <res-ref-name>eis/whitebox-notx</res-ref-name>
     <jndi-name>eis/whitebox-notx</jndi-name>
     <default-resource-principal>
-      <name>rauser1</name>
-      <password>rapassword1</password>
+      <name>cts1</name>
+      <password>cts1</password>
     </default-resource-principal>
   </resource-ref>
   <resource-ref>
     <res-ref-name>eis/whitebox-xa</res-ref-name>
     <jndi-name>eis/whitebox-xa</jndi-name>
     <default-resource-principal>
-      <name>rauser1</name>
-      <password>rapassword1</password>
+      <name>cts1</name>
+      <password>cts1</password>
     </default-resource-principal>
   </resource-ref>
   <resource-ref>

diff --git a/...rc/main/java/com/sun/ts/tests/connector/deployment/ejb_Deployment_ejb.jar.sun-ejb-jar.xml b/...rc/main/java/com/sun/ts/tests/connector/deployment/ejb_Deployment_ejb.jar.sun-ejb-jar.xml
@@ -28,8 +28,8 @@
         <res-ref-name>eis/ejb_Deployment_whitebox-tx.rar</res-ref-name>
         <jndi-name>eis/ejb_Deployment_whitebox-tx.rar</jndi-name>
         <default-resource-principal>
-          <name>rauser1</name>
-          <password>rapassword1</password>
+          <name>cts1</name>
+          <password>cts1</password>
         </default-resource-principal>
       </resource-ref>
       <pass-by-reference>false</pass-by-reference>

diff --git a/...src/main/java/com/sun/ts/tests/connector/localTx/connection/connectionClient1EjbTest.java b/...src/main/java/com/sun/ts/tests/connector/localTx/connection/connectionClient1EjbTest.java
@@ -69,6 +69,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
             JavaArchive localTx_conn_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "localTx_conn_ejb_vehicle_client.jar");
             // The class files
             localTx_conn_ejb_vehicle_client.addClasses(
+            com.sun.ts.tests.connector.localTx.connection.connectionClient1.class,
             com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
             com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
             com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class,
@@ -82,12 +83,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
             com.sun.ts.tests.common.vehicle.VehicleClient.class
             );
             // The application-client.xml descriptor
-            URL resURL = connectionClient1.class.getResource("/com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml");
+            URL resURL = connectionClient1.class.getResource("localTx_conn_ejb_vehicle_client.xml");
             if(resURL != null) {
               localTx_conn_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
             }
             // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension?
-            resURL = connectionClient1.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.jar.sun-application-client.xml");
+            resURL = connectionClient1.class.getResource("localTx_conn_ejb_vehicle_client.jar.sun-application-client.xml");
             if(resURL != null) {
               localTx_conn_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
             }
@@ -113,12 +114,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
                 com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class
             );
             // The ejb-jar.xml descriptor
-            URL ejbResURL1 = connectionClient1.class.getResource("/ejb_vehicle_ejb.xml");
+            URL ejbResURL1 = connectionClient1.class.getResource("localTx_conn_ejb_vehicle_ejb.xml");
             if(ejbResURL1 != null) {
               localTx_conn_ejb_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml");
             }
             // The sun-ejb-jar.xml file
-            ejbResURL1 = connectionClient1.class.getResource("/ejb_vehicle_ejb.jar.sun-ejb-jar.xml");
+            ejbResURL1 = connectionClient1.class.getResource("localTx_conn_ejb_vehicle_ejb.jar.sun-ejb-jar.xml");
             if(ejbResURL1 != null) {
               localTx_conn_ejb_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml");
             }

diff --git a/...un/ts/tests/connector/localTx/connection/localTx_conn_ejb_vehicle_ejb.jar.sun-ejb-jar.xml b/...un/ts/tests/connector/localTx/connection/localTx_conn_ejb_vehicle_ejb.jar.sun-ejb-jar.xml
@@ -28,8 +28,8 @@
         <res-ref-name>eis/whitebox-tx</res-ref-name>
         <jndi-name>eis/whitebox-tx</jndi-name>
         <default-resource-principal>
-          <name>rauser1</name>
-          <password>rapassword1</password>
+          <name>cts1</name>
+          <password>cts1</password>
         </default-resource-principal>
       </resource-ref>
       <resource-ref>