Revert "update refactoring without eclipse-ee4j/jakartaee-tck-tools#129…

… change but latest as of August 28, 2024 tck-rewrite/tck-rewrite-ant" This reverts commit 671ae39.
scottmarlow · Sep 27, 2024 · 4d984bf · 4d984bf
1 parent d927ab3
commit 4d984bf
Show file tree

Hide file tree

Showing 871 changed files with 871 additions and 871 deletions.
diff --git a/...tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientAppmanagedTest.java b/...tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientAppmanagedTest.java
@@ -95,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
             if(resURL != null) {
               jpa_core_EntityGraph_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
             }
-            jpa_core_EntityGraph_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF");
+            jpa_core_EntityGraph_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF");
             // Call the archive processor
             archiveProcessor.processClientArchive(jpa_core_EntityGraph_appmanaged_vehicle_client, Client.class, resURL);
 

diff --git a/...s/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientAppmanagednotxTest.java b/...s/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientAppmanagednotxTest.java
@@ -94,7 +94,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
             if(resURL != null) {
               jpa_core_EntityGraph_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
             }
-            jpa_core_EntityGraph_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF");
+            jpa_core_EntityGraph_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF");
             // Call the archive processor
             archiveProcessor.processClientArchive(jpa_core_EntityGraph_appmanagedNoTx_vehicle_client, Client.class, resURL);
 

diff --git a/...-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientStateful3Test.java b/...-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientStateful3Test.java
@@ -94,7 +94,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
             if(resURL != null) {
               jpa_core_EntityGraph_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
             }
-            jpa_core_EntityGraph_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF");
+            jpa_core_EntityGraph_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF");
             // Call the archive processor
             archiveProcessor.processClientArchive(jpa_core_EntityGraph_stateful3_vehicle_client, Client.class, resURL);
 

diff --git a/...tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientStateless3Test.java b/...tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientStateless3Test.java
@@ -94,7 +94,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
             if(resURL != null) {
               jpa_core_EntityGraph_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
             }
-            jpa_core_EntityGraph_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF");
+            jpa_core_EntityGraph_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF");
             // Call the archive processor
             archiveProcessor.processClientArchive(jpa_core_EntityGraph_stateless3_vehicle_client, Client.class, resURL);
 

diff --git a/...main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1AppmanagedTest.java b/...main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1AppmanagedTest.java
@@ -95,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
             if(resURL != null) {
               jpa_core_StoredProcedureQuery_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
             }
-            jpa_core_StoredProcedureQuery_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF");
+            jpa_core_StoredProcedureQuery_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF");
             // Call the archive processor
             archiveProcessor.processClientArchive(jpa_core_StoredProcedureQuery_appmanaged_vehicle_client, Client1.class, resURL);
 

diff --git a/.../java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1AppmanagednotxTest.java b/.../java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1AppmanagednotxTest.java
@@ -95,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
             if(resURL != null) {
               jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
             }
-            jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF");
+            jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF");
             // Call the archive processor
             archiveProcessor.processClientArchive(jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client, Client1.class, resURL);
 

diff --git a/.../main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1Stateful3Test.java b/.../main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1Stateful3Test.java
@@ -95,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
             if(resURL != null) {
               jpa_core_StoredProcedureQuery_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
             }
-            jpa_core_StoredProcedureQuery_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF");
+            jpa_core_StoredProcedureQuery_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF");
             // Call the archive processor
             archiveProcessor.processClientArchive(jpa_core_StoredProcedureQuery_stateful3_vehicle_client, Client1.class, resURL);
 

diff --git a/...main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1Stateless3Test.java b/...main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1Stateless3Test.java
@@ -95,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
             if(resURL != null) {
               jpa_core_StoredProcedureQuery_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
             }
-            jpa_core_StoredProcedureQuery_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF");
+            jpa_core_StoredProcedureQuery_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF");
             // Call the archive processor
             archiveProcessor.processClientArchive(jpa_core_StoredProcedureQuery_stateless3_vehicle_client, Client1.class, resURL);
 

diff --git a/...main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2AppmanagedTest.java b/...main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2AppmanagedTest.java
@@ -95,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
             if(resURL != null) {
               jpa_core_StoredProcedureQuery_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
             }
-            jpa_core_StoredProcedureQuery_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF");
+            jpa_core_StoredProcedureQuery_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF");
             // Call the archive processor
             archiveProcessor.processClientArchive(jpa_core_StoredProcedureQuery_appmanaged_vehicle_client, Client2.class, resURL);
 

diff --git a/.../java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2AppmanagednotxTest.java b/.../java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2AppmanagednotxTest.java
@@ -95,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
             if(resURL != null) {
               jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
             }
-            jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF");
+            jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF");
             // Call the archive processor
             archiveProcessor.processClientArchive(jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client, Client2.class, resURL);
 

diff --git a/.../main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2Stateful3Test.java b/.../main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2Stateful3Test.java
@@ -95,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
             if(resURL != null) {
               jpa_core_StoredProcedureQuery_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
             }
-            jpa_core_StoredProcedureQuery_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF");
+            jpa_core_StoredProcedureQuery_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF");
             // Call the archive processor
             archiveProcessor.processClientArchive(jpa_core_StoredProcedureQuery_stateful3_vehicle_client, Client2.class, resURL);
 

diff --git a/...main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2Stateless3Test.java b/...main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2Stateless3Test.java
@@ -95,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
             if(resURL != null) {
               jpa_core_StoredProcedureQuery_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
             }
-            jpa_core_StoredProcedureQuery_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF");
+            jpa_core_StoredProcedureQuery_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF");
             // Call the archive processor
             archiveProcessor.processClientArchive(jpa_core_StoredProcedureQuery_stateless3_vehicle_client, Client2.class, resURL);
 

diff --git a/.../java/ee/jakarta/tck/persistence/core/annotations/access/field/Client1AppmanagedTest.java b/.../java/ee/jakarta/tck/persistence/core/annotations/access/field/Client1AppmanagedTest.java
@@ -95,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
             if(resURL != null) {
               jpa_core_annotations_access_field_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
             }
-            jpa_core_annotations_access_field_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF");
+            jpa_core_annotations_access_field_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF");
             // Call the archive processor
             archiveProcessor.processClientArchive(jpa_core_annotations_access_field_appmanaged_vehicle_client, Client1.class, resURL);
 

diff --git a/...a/ee/jakarta/tck/persistence/core/annotations/access/field/Client1AppmanagednotxTest.java b/...a/ee/jakarta/tck/persistence/core/annotations/access/field/Client1AppmanagednotxTest.java
@@ -95,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
             if(resURL != null) {
               jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
             }
-            jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF");
+            jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF");
             // Call the archive processor
             archiveProcessor.processClientArchive(jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client, Client1.class, resURL);
 

diff --git a/...n/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client1Stateful3Test.java b/...n/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client1Stateful3Test.java
@@ -95,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
             if(resURL != null) {
               jpa_core_annotations_access_field_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
             }
-            jpa_core_annotations_access_field_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF");
+            jpa_core_annotations_access_field_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF");
             // Call the archive processor
             archiveProcessor.processClientArchive(jpa_core_annotations_access_field_stateful3_vehicle_client, Client1.class, resURL);
 

diff --git a/.../java/ee/jakarta/tck/persistence/core/annotations/access/field/Client1Stateless3Test.java b/.../java/ee/jakarta/tck/persistence/core/annotations/access/field/Client1Stateless3Test.java
@@ -95,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
             if(resURL != null) {
               jpa_core_annotations_access_field_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
             }
-            jpa_core_annotations_access_field_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF");
+            jpa_core_annotations_access_field_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF");
             // Call the archive processor
             archiveProcessor.processClientArchive(jpa_core_annotations_access_field_stateless3_vehicle_client, Client1.class, resURL);
 

diff --git a/.../java/ee/jakarta/tck/persistence/core/annotations/access/field/Client2AppmanagedTest.java b/.../java/ee/jakarta/tck/persistence/core/annotations/access/field/Client2AppmanagedTest.java
@@ -95,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
             if(resURL != null) {
               jpa_core_annotations_access_field_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
             }
-            jpa_core_annotations_access_field_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF");
+            jpa_core_annotations_access_field_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF");
             // Call the archive processor
             archiveProcessor.processClientArchive(jpa_core_annotations_access_field_appmanaged_vehicle_client, Client2.class, resURL);
 

diff --git a/...a/ee/jakarta/tck/persistence/core/annotations/access/field/Client2AppmanagednotxTest.java b/...a/ee/jakarta/tck/persistence/core/annotations/access/field/Client2AppmanagednotxTest.java
@@ -95,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
             if(resURL != null) {
               jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
             }
-            jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF");
+            jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF");
             // Call the archive processor
             archiveProcessor.processClientArchive(jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client, Client2.class, resURL);
 

diff --git a/...n/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client2Stateful3Test.java b/...n/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client2Stateful3Test.java
@@ -95,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
             if(resURL != null) {
               jpa_core_annotations_access_field_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
             }
-            jpa_core_annotations_access_field_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF");
+            jpa_core_annotations_access_field_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF");
             // Call the archive processor
             archiveProcessor.processClientArchive(jpa_core_annotations_access_field_stateful3_vehicle_client, Client2.class, resURL);
 

diff --git a/.../java/ee/jakarta/tck/persistence/core/annotations/access/field/Client2Stateless3Test.java b/.../java/ee/jakarta/tck/persistence/core/annotations/access/field/Client2Stateless3Test.java
@@ -95,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
             if(resURL != null) {
               jpa_core_annotations_access_field_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
             }
-            jpa_core_annotations_access_field_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF");
+            jpa_core_annotations_access_field_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF");
             // Call the archive processor
             archiveProcessor.processClientArchive(jpa_core_annotations_access_field_stateless3_vehicle_client, Client2.class, resURL);
 

diff --git a/.../java/ee/jakarta/tck/persistence/core/annotations/access/field/Client3AppmanagedTest.java b/.../java/ee/jakarta/tck/persistence/core/annotations/access/field/Client3AppmanagedTest.java
@@ -95,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
             if(resURL != null) {
               jpa_core_annotations_access_field_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
             }
-            jpa_core_annotations_access_field_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF");
+            jpa_core_annotations_access_field_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF");
             // Call the archive processor
             archiveProcessor.processClientArchive(jpa_core_annotations_access_field_appmanaged_vehicle_client, Client3.class, resURL);
 

diff --git a/...a/ee/jakarta/tck/persistence/core/annotations/access/field/Client3AppmanagednotxTest.java b/...a/ee/jakarta/tck/persistence/core/annotations/access/field/Client3AppmanagednotxTest.java
@@ -95,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
             if(resURL != null) {
               jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
             }
-            jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF");
+            jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF");
             // Call the archive processor
             archiveProcessor.processClientArchive(jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client, Client3.class, resURL);
 

diff --git a/...n/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client3Stateful3Test.java b/...n/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client3Stateful3Test.java
@@ -95,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
             if(resURL != null) {
               jpa_core_annotations_access_field_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
             }
-            jpa_core_annotations_access_field_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF");
+            jpa_core_annotations_access_field_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF");
             // Call the archive processor
             archiveProcessor.processClientArchive(jpa_core_annotations_access_field_stateful3_vehicle_client, Client3.class, resURL);
 

diff --git a/.../java/ee/jakarta/tck/persistence/core/annotations/access/field/Client3Stateless3Test.java b/.../java/ee/jakarta/tck/persistence/core/annotations/access/field/Client3Stateless3Test.java
@@ -95,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
             if(resURL != null) {
               jpa_core_annotations_access_field_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
             }
-            jpa_core_annotations_access_field_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF");
+            jpa_core_annotations_access_field_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF");
             // Call the archive processor
             archiveProcessor.processClientArchive(jpa_core_annotations_access_field_stateless3_vehicle_client, Client3.class, resURL);
 

diff --git a/.../java/ee/jakarta/tck/persistence/core/annotations/access/field/Client4AppmanagedTest.java b/.../java/ee/jakarta/tck/persistence/core/annotations/access/field/Client4AppmanagedTest.java
@@ -95,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
             if(resURL != null) {
               jpa_core_annotations_access_field_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
             }
-            jpa_core_annotations_access_field_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF");
+            jpa_core_annotations_access_field_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client4.class.getName() + "\n"), "MANIFEST.MF");
             // Call the archive processor
             archiveProcessor.processClientArchive(jpa_core_annotations_access_field_appmanaged_vehicle_client, Client4.class, resURL);