From 4476976a016af06658f56b66ddc53387e73e5638 Mon Sep 17 00:00:00 2001 From: Scott Marlow Date: Fri, 11 Oct 2024 19:32:25 -0400 Subject: [PATCH] More jpa appclient fixes (#1578) * Add setup method to com.sun.ts.tests.jpa.common.schema30.Util for appclient tests * add more trace output for vehicle determination to understand what needs to change for appclient vehicle * rename sun-application-client.xml back to sun-application-client.xml --- .../com/sun/ts/lib/harness/ServiceEETest.java | 13 +++++++++- .../tck/persistence/common/PMClientBase.java | 2 +- .../tck/persistence/common/schema30/Util.java | 25 +++++++++++++++++++ .../access/field/Client1AppmanagedTest.java | 2 +- .../field/Client1AppmanagednotxTest.java | 2 +- .../access/field/Client1Stateful3Test.java | 2 +- .../access/field/Client1Stateless3Test.java | 2 +- .../access/field/Client2AppmanagedTest.java | 2 +- .../field/Client2AppmanagednotxTest.java | 2 +- .../access/field/Client2Stateful3Test.java | 2 +- .../access/field/Client2Stateless3Test.java | 2 +- .../access/field/Client3AppmanagedTest.java | 2 +- .../field/Client3AppmanagednotxTest.java | 2 +- .../access/field/Client3Stateful3Test.java | 2 +- .../access/field/Client3Stateless3Test.java | 2 +- .../access/field/Client4AppmanagedTest.java | 2 +- .../field/Client4AppmanagednotxTest.java | 2 +- .../access/field/Client4Stateful3Test.java | 2 +- .../access/field/Client4Stateless3Test.java | 2 +- .../access/mappedsc/ClientAppmanagedTest.java | 2 +- .../mappedsc/ClientAppmanagednotxTest.java | 2 +- .../access/mappedsc/ClientStateful3Test.java | 2 +- .../access/mappedsc/ClientStateless3Test.java | 2 +- .../property/Client1AppmanagedTest.java | 2 +- .../property/Client1AppmanagednotxTest.java | 2 +- .../access/property/Client1Stateful3Test.java | 2 +- .../property/Client1Stateless3Test.java | 2 +- .../property/Client2AppmanagedTest.java | 2 +- .../property/Client2AppmanagednotxTest.java | 2 +- .../access/property/Client2Stateful3Test.java | 2 +- .../property/Client2Stateless3Test.java | 2 +- .../assocoverride/ClientAppmanagedTest.java | 2 +- .../ClientAppmanagednotxTest.java | 2 +- .../assocoverride/ClientStateful3Test.java | 2 +- .../assocoverride/ClientStateless3Test.java | 2 +- .../basic/Client1AppmanagedTest.java | 2 +- .../basic/Client1AppmanagednotxTest.java | 2 +- .../basic/Client1Stateful3Test.java | 2 +- .../basic/Client1Stateless3Test.java | 2 +- .../basic/Client2AppmanagedTest.java | 2 +- .../basic/Client2AppmanagednotxTest.java | 2 +- .../basic/Client2Stateful3Test.java | 2 +- .../basic/Client2Stateless3Test.java | 2 +- .../collectiontable/ClientAppmanagedTest.java | 2 +- .../ClientAppmanagednotxTest.java | 2 +- .../collectiontable/ClientStateful3Test.java | 2 +- .../collectiontable/ClientStateless3Test.java | 2 +- .../convert/ClientAppmanagedTest.java | 2 +- .../convert/ClientAppmanagednotxTest.java | 2 +- .../convert/ClientStateful3Test.java | 2 +- .../convert/ClientStateless3Test.java | 2 +- 51 files changed, 86 insertions(+), 50 deletions(-) diff --git a/common/src/main/java/com/sun/ts/lib/harness/ServiceEETest.java b/common/src/main/java/com/sun/ts/lib/harness/ServiceEETest.java index 01623bc87c..a0dc49cf7a 100644 --- a/common/src/main/java/com/sun/ts/lib/harness/ServiceEETest.java +++ b/common/src/main/java/com/sun/ts/lib/harness/ServiceEETest.java @@ -87,6 +87,7 @@ public Properties getVehicleSpecificClientProps(Properties p) { public Status run(String[] argv, Properties p) { Status status = null; boolean inTestHarness = TestUtil.iWhereAreWe == TestUtil.VM_HARNESS; + TestUtil.logTrace("Check if called from within test process, inTestHarness= " + inTestHarness); boolean isVehicleClient = false; URL thisURL = getClass().getProtectionDomain().getCodeSource().getLocation(); TestUtil.logTrace("in ServiceEETest.run(), this URL is: " + thisURL); @@ -95,7 +96,17 @@ public Status run(String[] argv, Properties p) { URL vcClassURL = vcClass.getProtectionDomain().getCodeSource().getLocation(); TestUtil.logTrace("VehicleClient URL is: " + vcClassURL); isVehicleClient = vcClass.isAssignableFrom(getClass()); - TestUtil.logTrace("VehicleClient URL is: " + vcClassURL); + TestUtil.logTrace("VehicleClient class check if is vehicle class = " + + (isVehicleClient? "yes, is a com.sun.ts.tests.common.vehicle.VehicleClient" + : "no, is not com.sun.ts.tests.common.vehicle.VehicleClient class")); + if (inTestHarness && !isVehicleClient) { + String sVehicle = TestUtil.getProperty(p, "vehicle"); + if("stateless3".equals(sVehicle) || "stateful3".equals(sVehicle) + || "appmanaged".equals(sVehicle) || "appmanagedNoTx".equals(sVehicle)) { + isVehicleClient = true; + TestUtil.logTrace("Using appclient vehicle so set is vehicle client to true"); + } + } } catch (ClassNotFoundException e) { TestUtil.logTrace("VehicleClient class not found, so not a vehicle client."); } diff --git a/jpa/common/src/main/java/ee/jakarta/tck/persistence/common/PMClientBase.java b/jpa/common/src/main/java/ee/jakarta/tck/persistence/common/PMClientBase.java index e7c9e45796..a520f4e869 100644 --- a/jpa/common/src/main/java/ee/jakarta/tck/persistence/common/PMClientBase.java +++ b/jpa/common/src/main/java/ee/jakarta/tck/persistence/common/PMClientBase.java @@ -137,7 +137,7 @@ abstract public class PMClientBase extends ServiceEETest implements UseEntityMan /** * Persistence unit name. */ - private String persistenceUnitName; + protected String persistenceUnitName; protected String secondPersistenceUnitName; diff --git a/jpa/common/src/main/java/ee/jakarta/tck/persistence/common/schema30/Util.java b/jpa/common/src/main/java/ee/jakarta/tck/persistence/common/schema30/Util.java index 57d4a780e4..acf84d8de9 100644 --- a/jpa/common/src/main/java/ee/jakarta/tck/persistence/common/schema30/Util.java +++ b/jpa/common/src/main/java/ee/jakarta/tck/persistence/common/schema30/Util.java @@ -1857,6 +1857,31 @@ public void removeTestData() { } } + public void setup(String[] args, Properties p) throws Exception { + logTrace("PMClientBase.setup"); + myProps = p; + + persistenceUnitName = p.getProperty(PERSISTENCE_UNIT_NAME_PROP); + logTrace("Persistence Unit Name =" + persistenceUnitName); + secondPersistenceUnitName = p + .getProperty(SECOND_PERSISTENCE_UNIT_NAME_PROP); + logTrace("Second Persistence Unit Name =" + secondPersistenceUnitName); + if (JAKARTA_EE.equalsIgnoreCase(p.getProperty(MODE_PROP))) { + logTrace(MODE_PROP + " is set to " + p.getProperty(MODE_PROP) + + ", so tests are running in JakartaEE environment."); + } else if (STANDALONE_MODE.equalsIgnoreCase(p.getProperty(MODE_PROP))) { + logTrace(MODE_PROP + " is set to " + p.getProperty(MODE_PROP) + + ", so tests are running in J2SE environment standalone mode." + + PERSISTENCE_UNIT_NAME_PROP + " is set to " + persistenceUnitName); + } else { + logMsg("WARNING: " + MODE_PROP + " is set to " + p.getProperty(MODE_PROP) + + ", an invalid value."); + } + + cachingSupported = Boolean.parseBoolean( + p.getProperty(PERSISTENCE_SECOND_LEVEL_CACHING_SUPPORTED, "true")); + displayProperties(p); + } public void setupProductData(String[] args, Properties p) throws Exception { logTrace("setupProductData"); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client1AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client1AppmanagedTest.java index 292a3b8536..5b0b33c95d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client1AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client1AppmanagedTest.java @@ -106,7 +106,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 = Client1.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); 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(resURL, "sun-application-client.xml"); } jpa_core_annotations_access_field_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client1AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client1AppmanagednotxTest.java index 7f4b271f03..a8e92b23ac 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client1AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client1AppmanagednotxTest.java @@ -108,7 +108,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 = Client1.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); 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(resURL, "sun-application-client.xml"); } jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client1Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client1Stateful3Test.java index 600a507b98..6485b3894a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client1Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client1Stateful3Test.java @@ -108,7 +108,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 = Client1.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); 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(resURL, "sun-application-client.xml"); } jpa_core_annotations_access_field_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client1Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client1Stateless3Test.java index 7e60d7605b..da242718ad 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client1Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client1Stateless3Test.java @@ -108,7 +108,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 = Client1.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); 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(resURL, "sun-application-client.xml"); } jpa_core_annotations_access_field_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client2AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client2AppmanagedTest.java index ee1ae9e6b3..c009c3970d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client2AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client2AppmanagedTest.java @@ -108,7 +108,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 = Client2.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); 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(resURL, "sun-application-client.xml"); } jpa_core_annotations_access_field_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client2AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client2AppmanagednotxTest.java index 434819dff0..7d4cb574a4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client2AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client2AppmanagednotxTest.java @@ -108,7 +108,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 = Client2.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); 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(resURL, "sun-application-client.xml"); } jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client2Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client2Stateful3Test.java index dfc2e3177b..5a84d38c01 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client2Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client2Stateful3Test.java @@ -108,7 +108,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 = Client2.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); 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(resURL, "sun-application-client.xml"); } jpa_core_annotations_access_field_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client2Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client2Stateless3Test.java index bc2ce40e42..1bb948e474 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client2Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client2Stateless3Test.java @@ -108,7 +108,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 = Client2.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); 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(resURL, "sun-application-client.xml"); } jpa_core_annotations_access_field_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client3AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client3AppmanagedTest.java index 9878f1a252..3595f39cba 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client3AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client3AppmanagedTest.java @@ -108,7 +108,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 = Client3.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); 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(resURL, "sun-application-client.xml"); } jpa_core_annotations_access_field_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client3AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client3AppmanagednotxTest.java index ffcf3379bd..78f0ff339e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client3AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client3AppmanagednotxTest.java @@ -108,7 +108,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 = Client3.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); 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(resURL, "sun-application-client.xml"); } jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client3Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client3Stateful3Test.java index 8e58490c9f..0aeb885bab 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client3Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client3Stateful3Test.java @@ -108,7 +108,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 = Client3.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); 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(resURL, "sun-application-client.xml"); } jpa_core_annotations_access_field_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client3Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client3Stateless3Test.java index c087d73143..cd28f41350 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client3Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client3Stateless3Test.java @@ -108,7 +108,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 = Client3.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); 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(resURL, "sun-application-client.xml"); } jpa_core_annotations_access_field_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client4AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client4AppmanagedTest.java index 8bddd91544..1f5f66fd1b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client4AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client4AppmanagedTest.java @@ -108,7 +108,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 = Client4.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); 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(resURL, "sun-application-client.xml"); } jpa_core_annotations_access_field_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client4.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client4AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client4AppmanagednotxTest.java index 17b52f337b..98619f9202 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client4AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client4AppmanagednotxTest.java @@ -108,7 +108,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 = Client4.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); 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(resURL, "sun-application-client.xml"); } jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client4.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client4Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client4Stateful3Test.java index b48b021cc2..7f825a0b45 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client4Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client4Stateful3Test.java @@ -108,7 +108,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 = Client4.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); 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(resURL, "sun-application-client.xml"); } jpa_core_annotations_access_field_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client4.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client4Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client4Stateless3Test.java index d324ed338d..5f1485371e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client4Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client4Stateless3Test.java @@ -108,7 +108,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 = Client4.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); 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(resURL, "sun-application-client.xml"); } jpa_core_annotations_access_field_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client4.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/mappedsc/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/mappedsc/ClientAppmanagedTest.java index 6caad7a607..35c69dc00e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/mappedsc/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/mappedsc/ClientAppmanagedTest.java @@ -98,7 +98,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/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { - jpa_core_anno_access_mappedsc_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + jpa_core_anno_access_mappedsc_appmanaged_vehicle_client.addAsManifestResource(resURL, "sun-application-client.xml"); } jpa_core_anno_access_mappedsc_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/mappedsc/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/mappedsc/ClientAppmanagednotxTest.java index 5f0edc0404..1879027960 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/mappedsc/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/mappedsc/ClientAppmanagednotxTest.java @@ -104,7 +104,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/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { - jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "sun-application-client.xml"); } jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/mappedsc/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/mappedsc/ClientStateful3Test.java index e394f32d28..e3f9732bbc 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/mappedsc/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/mappedsc/ClientStateful3Test.java @@ -98,7 +98,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/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { - jpa_core_anno_access_mappedsc_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + jpa_core_anno_access_mappedsc_stateful3_vehicle_client.addAsManifestResource(resURL, "sun-application-client.xml"); } jpa_core_anno_access_mappedsc_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/mappedsc/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/mappedsc/ClientStateless3Test.java index 3a2613da31..0c528780f5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/mappedsc/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/mappedsc/ClientStateless3Test.java @@ -105,7 +105,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/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { - jpa_core_anno_access_mappedsc_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + jpa_core_anno_access_mappedsc_stateless3_vehicle_client.addAsManifestResource(resURL, "sun-application-client.xml"); } jpa_core_anno_access_mappedsc_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client1AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client1AppmanagedTest.java index d62cff1bd9..91061aa3d6 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client1AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client1AppmanagedTest.java @@ -97,7 +97,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 = Client1.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { - jpa_core_annotations_access_property_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + jpa_core_annotations_access_property_appmanaged_vehicle_client.addAsManifestResource(resURL, "sun-application-client.xml"); } jpa_core_annotations_access_property_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client1AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client1AppmanagednotxTest.java index 9f38103ab5..f9e187e935 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client1AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client1AppmanagednotxTest.java @@ -108,7 +108,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 = Client1.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { - jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "sun-application-client.xml"); } jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client1Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client1Stateful3Test.java index 657a21e13d..7f3e5a53ca 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client1Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client1Stateful3Test.java @@ -97,7 +97,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 = Client1.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { - jpa_core_annotations_access_property_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + jpa_core_annotations_access_property_stateful3_vehicle_client.addAsManifestResource(resURL, "sun-application-client.xml"); } jpa_core_annotations_access_property_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client1Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client1Stateless3Test.java index 2ecfbb73f9..e6faa4b772 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client1Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client1Stateless3Test.java @@ -103,7 +103,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 = Client1.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { - jpa_core_annotations_access_property_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + jpa_core_annotations_access_property_stateless3_vehicle_client.addAsManifestResource(resURL, "sun-application-client.xml"); } jpa_core_annotations_access_property_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client2AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client2AppmanagedTest.java index fa999e1fe8..eff4844d9f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client2AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client2AppmanagedTest.java @@ -107,7 +107,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 = Client2.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { - jpa_core_annotations_access_property_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + jpa_core_annotations_access_property_appmanaged_vehicle_client.addAsManifestResource(resURL, "sun-application-client.xml"); } jpa_core_annotations_access_property_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client2AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client2AppmanagednotxTest.java index 2139b344eb..a82ec3cfbb 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client2AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client2AppmanagednotxTest.java @@ -97,7 +97,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 = Client2.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { - jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "sun-application-client.xml"); } jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client2Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client2Stateful3Test.java index cedb69bfd0..17e44be59e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client2Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client2Stateful3Test.java @@ -105,7 +105,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 = Client2.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { - jpa_core_annotations_access_property_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + jpa_core_annotations_access_property_stateful3_vehicle_client.addAsManifestResource(resURL, "sun-application-client.xml"); } jpa_core_annotations_access_property_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client2Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client2Stateless3Test.java index b5f837b688..116844aaa1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client2Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client2Stateless3Test.java @@ -105,7 +105,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 = Client2.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { - jpa_core_annotations_access_property_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + jpa_core_annotations_access_property_stateless3_vehicle_client.addAsManifestResource(resURL, "sun-application-client.xml"); } jpa_core_annotations_access_property_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/assocoverride/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/assocoverride/ClientAppmanagedTest.java index 9fe02a9a7e..cbcb287109 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/assocoverride/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/assocoverride/ClientAppmanagedTest.java @@ -97,7 +97,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/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { - jpa_core_annotations_assocoverride_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + jpa_core_annotations_assocoverride_appmanaged_vehicle_client.addAsManifestResource(resURL, "sun-application-client.xml"); } jpa_core_annotations_assocoverride_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/assocoverride/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/assocoverride/ClientAppmanagednotxTest.java index e4ccefb15d..8fb124cd92 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/assocoverride/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/assocoverride/ClientAppmanagednotxTest.java @@ -105,7 +105,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/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { - jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "sun-application-client.xml"); } jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/assocoverride/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/assocoverride/ClientStateful3Test.java index 05090b5e00..22f647c5c9 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/assocoverride/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/assocoverride/ClientStateful3Test.java @@ -104,7 +104,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/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { - jpa_core_annotations_assocoverride_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + jpa_core_annotations_assocoverride_stateful3_vehicle_client.addAsManifestResource(resURL, "sun-application-client.xml"); } jpa_core_annotations_assocoverride_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/assocoverride/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/assocoverride/ClientStateless3Test.java index 4ff13c6855..4bb8082fff 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/assocoverride/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/assocoverride/ClientStateless3Test.java @@ -105,7 +105,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/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { - jpa_core_annotations_assocoverride_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + jpa_core_annotations_assocoverride_stateless3_vehicle_client.addAsManifestResource(resURL, "sun-application-client.xml"); } jpa_core_annotations_assocoverride_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client1AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client1AppmanagedTest.java index a7b1037e88..e0200c87e1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client1AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client1AppmanagedTest.java @@ -103,7 +103,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 = Client1.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { - jpa_core_annotations_basic_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + jpa_core_annotations_basic_appmanaged_vehicle_client.addAsManifestResource(resURL, "sun-application-client.xml"); } jpa_core_annotations_basic_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client1AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client1AppmanagednotxTest.java index a2a5c33433..fd7ad0f7f3 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client1AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client1AppmanagednotxTest.java @@ -106,7 +106,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 = Client1.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { - jpa_core_annotations_basic_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + jpa_core_annotations_basic_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "sun-application-client.xml"); } jpa_core_annotations_basic_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client1Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client1Stateful3Test.java index e9b8a5be81..e7eaef1c62 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client1Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client1Stateful3Test.java @@ -95,7 +95,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 = Client1.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { - jpa_core_annotations_basic_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + jpa_core_annotations_basic_stateful3_vehicle_client.addAsManifestResource(resURL, "sun-application-client.xml"); } jpa_core_annotations_basic_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client1Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client1Stateless3Test.java index 242f1d254a..77bf504c3e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client1Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client1Stateless3Test.java @@ -103,7 +103,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 = Client1.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { - jpa_core_annotations_basic_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + jpa_core_annotations_basic_stateless3_vehicle_client.addAsManifestResource(resURL, "sun-application-client.xml"); } jpa_core_annotations_basic_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client2AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client2AppmanagedTest.java index ec295c0f19..77225b771c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client2AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client2AppmanagedTest.java @@ -102,7 +102,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 = Client2.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { - jpa_core_annotations_basic_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + jpa_core_annotations_basic_appmanaged_vehicle_client.addAsManifestResource(resURL, "sun-application-client.xml"); } jpa_core_annotations_basic_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client2AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client2AppmanagednotxTest.java index e8650d98ce..09e07d0560 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client2AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client2AppmanagednotxTest.java @@ -95,7 +95,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 = Client2.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { - jpa_core_annotations_basic_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + jpa_core_annotations_basic_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "sun-application-client.xml"); } jpa_core_annotations_basic_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client2Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client2Stateful3Test.java index f82579b2c7..b8434f063d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client2Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client2Stateful3Test.java @@ -103,7 +103,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 = Client2.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { - jpa_core_annotations_basic_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + jpa_core_annotations_basic_stateful3_vehicle_client.addAsManifestResource(resURL, "sun-application-client.xml"); } jpa_core_annotations_basic_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client2Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client2Stateless3Test.java index 9ed6e350b3..6cb6e5bca1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client2Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client2Stateless3Test.java @@ -106,7 +106,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 = Client2.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { - jpa_core_annotations_basic_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + jpa_core_annotations_basic_stateless3_vehicle_client.addAsManifestResource(resURL, "sun-application-client.xml"); } jpa_core_annotations_basic_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/collectiontable/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/collectiontable/ClientAppmanagedTest.java index 283d0cf311..fbbeda110e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/collectiontable/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/collectiontable/ClientAppmanagedTest.java @@ -104,7 +104,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/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { - jpa_core_annotations_collectiontable_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + jpa_core_annotations_collectiontable_appmanaged_vehicle_client.addAsManifestResource(resURL, "sun-application-client.xml"); } jpa_core_annotations_collectiontable_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/collectiontable/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/collectiontable/ClientAppmanagednotxTest.java index 3563fb2bae..9c14f081b7 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/collectiontable/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/collectiontable/ClientAppmanagednotxTest.java @@ -103,7 +103,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/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { - jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "sun-application-client.xml"); } jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/collectiontable/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/collectiontable/ClientStateful3Test.java index 8870c31642..7e9695dfdc 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/collectiontable/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/collectiontable/ClientStateful3Test.java @@ -102,7 +102,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/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { - jpa_core_annotations_collectiontable_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + jpa_core_annotations_collectiontable_stateful3_vehicle_client.addAsManifestResource(resURL, "sun-application-client.xml"); } jpa_core_annotations_collectiontable_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/collectiontable/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/collectiontable/ClientStateless3Test.java index 93aeb24353..fcaea8a83b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/collectiontable/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/collectiontable/ClientStateless3Test.java @@ -102,7 +102,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/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { - jpa_core_annotations_collectiontable_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + jpa_core_annotations_collectiontable_stateless3_vehicle_client.addAsManifestResource(resURL, "sun-application-client.xml"); } jpa_core_annotations_collectiontable_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/convert/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/convert/ClientAppmanagedTest.java index 089370f4b1..285c5225b5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/convert/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/convert/ClientAppmanagedTest.java @@ -102,7 +102,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/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { - jpa_core_convert_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + jpa_core_convert_appmanaged_vehicle_client.addAsManifestResource(resURL, "sun-application-client.xml"); } jpa_core_convert_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/convert/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/convert/ClientAppmanagednotxTest.java index 310d4b5147..991156f733 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/convert/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/convert/ClientAppmanagednotxTest.java @@ -102,7 +102,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/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { - jpa_core_convert_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + jpa_core_convert_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "sun-application-client.xml"); } jpa_core_convert_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/convert/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/convert/ClientStateful3Test.java index b44b56434a..bdddb8ebb6 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/convert/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/convert/ClientStateful3Test.java @@ -102,7 +102,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/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { - jpa_core_convert_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + jpa_core_convert_stateful3_vehicle_client.addAsManifestResource(resURL, "sun-application-client.xml"); } jpa_core_convert_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/convert/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/convert/ClientStateless3Test.java index 522ed83c22..8b1dfd3fae 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/convert/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/convert/ClientStateless3Test.java @@ -102,7 +102,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/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { - jpa_core_convert_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); + jpa_core_convert_stateless3_vehicle_client.addAsManifestResource(resURL, "sun-application-client.xml"); } jpa_core_convert_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor